[Groonga-commit] groonga/groonga at baeb53a [master] ctx: add null check for ctx->impl->expr_vars

Back to archive index

Susumu Yata null+****@clear*****
Mon Nov 20 16:22:06 JST 2017


Susumu Yata	2017-11-20 16:22:06 +0900 (Mon, 20 Nov 2017)

  New Revision: baeb53ad2c9561b6efd66a94f4abed8de115f6d9
  https://github.com/groonga/groonga/commit/baeb53ad2c9561b6efd66a94f4abed8de115f6d9

  Message:
    ctx: add null check for ctx->impl->expr_vars

  Modified files:
    lib/ctx.c

  Modified: lib/ctx.c (+2 -2)
===================================================================
--- lib/ctx.c    2017-11-20 16:10:46 +0900 (a43dd41cd)
+++ lib/ctx.c    2017-11-20 16:22:06 +0900 (6a9c3ee3a)
@@ -492,7 +492,7 @@ grn_ctx_fin(grn_ctx *ctx)
     GRN_OBJ_FIN(ctx, &ctx->impl->output.names);
     GRN_OBJ_FIN(ctx, &ctx->impl->output.levels);
     rc = grn_obj_close(ctx, ctx->impl->output.buf);
-    {
+    if (ctx->impl->expr_vars) {
       grn_hash **vp;
       grn_obj *value;
       GRN_HASH_EACH(ctx, ctx->impl->expr_vars, eid, NULL, NULL, &vp, {
@@ -503,8 +503,8 @@ grn_ctx_fin(grn_ctx *ctx)
         }
         grn_hash_close(ctx, *vp);
       });
+      grn_hash_close(ctx, ctx->impl->expr_vars);
     }
-    grn_hash_close(ctx, ctx->impl->expr_vars);
     if (ctx->impl->db && ctx->flags & GRN_CTX_PER_DB) {
       grn_obj *db = ctx->impl->db;
       ctx->impl->db = NULL;
-------------- next part --------------
HTML����������������������������...
URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20171120/b21daa52/attachment-0001.htm 



More information about the Groonga-commit mailing list
Back to archive index