Susumu Yata
null+****@clear*****
Mon Dec 7 18:48:34 JST 2015
Susumu Yata 2015-12-07 18:48:34 +0900 (Mon, 07 Dec 2015) New Revision: 55339555002c2ce308bdac9d0c16c393baf864ba https://github.com/groonga/groonga/commit/55339555002c2ce308bdac9d0c16c393baf864ba Message: grn_ts: add error handling Modified files: lib/ts/ts_expr_node.c Modified: lib/ts/ts_expr_node.c (+6 -2) =================================================================== --- lib/ts/ts_expr_node.c 2015-12-07 16:40:33 +0900 (69b5c41) +++ lib/ts/ts_expr_node.c 2015-12-07 18:48:34 +0900 (4934715) @@ -2454,12 +2454,16 @@ grn_ts_expr_column_node_evaluate_scalar(grn_ctx *ctx, case GRN_TS_TEXT: { size_t i; char *buf_ptr; + grn_rc rc; grn_ts_text *out_ptr = (grn_ts_text *)out; grn_ja_reader reader; - grn_ja_reader_init(ctx, &reader, (grn_ja *)node->column); + rc = grn_ja_reader_init(ctx, &reader, (grn_ja *)node->column); + if (rc != GRN_SUCCESS) { + GRN_TS_ERR_RETURN(rc, "grn_ja_reader_init failed"); + } node->buf.pos = 0; for (i = 0; i < n_in; i++) { - grn_rc rc = grn_ja_reader_seek(ctx, &reader, in[i].id); + rc = grn_ja_reader_seek(ctx, &reader, in[i].id); if (rc == GRN_SUCCESS) { rc = grn_ts_buf_reserve(ctx, &node->buf, node->buf.pos + reader.value_size); -------------- next part -------------- HTML����������������������������...Download
