Kouhei Sutou
null+****@clear*****
Fri May 20 18:00:05 JST 2016
Kouhei Sutou 2016-05-20 18:00:05 +0900 (Fri, 20 May 2016) New Revision: f624dc38f38f8cf35b34aa1a50541d9d10c6dc70 https://github.com/groonga/groonga/commit/f624dc38f38f8cf35b34aa1a50541d9d10c6dc70 Message: select: fix free order Modified files: lib/proc/proc_select.c Modified: lib/proc/proc_select.c (+8 -8) =================================================================== --- lib/proc/proc_select.c 2016-05-20 17:59:23 +0900 (44c1c81) +++ lib/proc/proc_select.c 2016-05-20 18:00:05 +0900 (83ce9a6) @@ -2329,6 +2329,14 @@ grn_select(grn_ctx *ctx, grn_select_data *data) } exit : + if (data->condition.expression) { + grn_obj_unlink(ctx, data->condition.expression); + } + + if (data->condition.match_columns) { + grn_obj_unlink(ctx, data->condition.match_columns); + } + if (data->drilldown.keys) { grn_table_sort_key_close(ctx, data->drilldown.keys, @@ -2353,14 +2361,6 @@ exit : grn_ctx_set_match_escalation_threshold(ctx, original_threshold); } - if (data->condition.match_columns) { - grn_obj_unlink(ctx, data->condition.match_columns); - } - - if (data->condition.expression) { - grn_obj_unlink(ctx, data->condition.expression); - } - /* GRN_LOG(ctx, GRN_LOG_NONE, "%d", ctx->seqno); */ return ctx->rc; -------------- next part -------------- HTML����������������������������...Download
