Kouhei Sutou
null+****@clear*****
Sat Jan 16 13:13:01 JST 2016
Kouhei Sutou 2016-01-16 13:13:01 +0900 (Sat, 16 Jan 2016) New Revision: 3121cba1d3005e1d3b50169214359a70d03f0c08 https://github.com/groonga/groonga/commit/3121cba1d3005e1d3b50169214359a70d03f0c08 Message: Revert "Fix crash bug at the end when GRN_RUBY_SCRIPTS_DIR is not correct" This reverts commit 0569d17c78b6db072b1b96267bc02eb338d27d09. Users should check grn_init() return value. If grn_init() fails, users shouldn't call grn_fin(). Modified files: lib/ctx.c lib/request_canceler.c Modified: lib/ctx.c (+1 -2) =================================================================== --- lib/ctx.c 2016-01-16 12:27:43 +0900 (c7286e1) +++ lib/ctx.c 2016-01-16 13:13:01 +0900 (63b284a) @@ -2011,8 +2011,7 @@ void grn_cache_fin(void) { grn_cache_current_set(&grn_gctx, NULL); - if (grn_cache_default) - grn_cache_close(&grn_gctx, grn_cache_default); + grn_cache_close(&grn_gctx, grn_cache_default); } /**** memory allocation ****/ Modified: lib/request_canceler.c (+0 -3) =================================================================== --- lib/request_canceler.c 2016-01-16 12:27:43 +0900 (261e1fb) +++ lib/request_canceler.c 2016-01-16 13:13:01 +0900 (866292f) @@ -116,9 +116,6 @@ grn_request_canceler_fin(void) { grn_ctx *ctx = &grn_gctx; - if (!grn_the_request_canceler) - return; - grn_hash_close(ctx, grn_the_request_canceler->entries); MUTEX_FIN(grn_the_request_canceler->mutex); GRN_FREE(grn_the_request_canceler); -------------- next part -------------- HTML����������������������������...Download