Kouhei Sutou
null+****@clear*****
Mon May 20 18:58:54 JST 2013
Kouhei Sutou 2013-05-20 18:58:54 +0900 (Mon, 20 May 2013) New Revision: cf63b66afeeac48bda85a5b94a8b013e5d498f15 https://github.com/groonga/groonga/commit/cf63b66afeeac48bda85a5b94a8b013e5d498f15 Message: Fix a memory leak for "VECTOR_COLUMN && xxx" expression Modified files: lib/expr.c Modified: lib/expr.c (+5 -4) =================================================================== --- lib/expr.c 2013-05-20 18:58:32 +0900 (417bd5b) +++ lib/expr.c 2013-05-20 18:58:54 +0900 (246b182) @@ -3123,16 +3123,17 @@ grn_expr_exec(grn_ctx *ctx, grn_obj *expr, int nargs) { grn_obj *x, *y; unsigned int x_boolean, y_boolean; + int result; POP2ALLOC1(x, y, res); GRN_TRUEP(ctx, x, x_boolean); GRN_TRUEP(ctx, y, y_boolean); if (x_boolean && y_boolean) { - GRN_INT32_SET(ctx, res, 1); + result = 1; } else { - GRN_INT32_SET(ctx, res, 0); + result = 0; } - res->header.type = GRN_BULK; - res->header.domain = GRN_DB_INT32; + grn_obj_reinit(ctx, res, GRN_DB_INT32, 0); + GRN_INT32_SET(ctx, res, result); } code++; break; -------------- next part -------------- HTML����������������������������...Download
