Hiroshi Hatake
null+****@clear*****
Sat Feb 14 15:09:57 JST 2015
Hiroshi Hatake 2015-02-14 15:09:57 +0900 (Sat, 14 Feb 2015) New Revision: 864fc2cf30c2592a93e164d63b9012affab5f987 https://github.com/ranguba/rroonga/commit/864fc2cf30c2592a93e164d63b9012affab5f987 Message: Fix grn_obj_unlink calling position There is a possibility that rb_grn_context_check() raises exception. So, it needs to call grn_obj_unlink() before calling rb_grn_context_check(). Modified files: ext/groonga/rb-grn-table.c Modified: ext/groonga/rb-grn-table.c (+1 -2) =================================================================== --- ext/groonga/rb-grn-table.c 2015-02-14 14:19:16 +0900 (601065d) +++ ext/groonga/rb-grn-table.c 2015-02-14 15:09:57 +0900 (9193a01) @@ -1472,11 +1472,10 @@ rb_grn_table_group (int argc, VALUE *argv, VALUE self) } rc = grn_table_group(context, table, keys, n_keys, &result, 1); + grn_obj_unlink(context, result.calc_target); rb_grn_context_check(context, self); rb_grn_rc_check(rc, self); - grn_obj_unlink(context, result.calc_target); - return GRNOBJECT2RVAL(Qnil, context, result.table, GRN_TRUE); } -------------- next part -------------- HTML����������������������������...Download