Kouhei Sutou
null+****@clear*****
Wed Mar 16 23:24:10 JST 2016
Kouhei Sutou 2016-03-16 23:24:10 +0900 (Wed, 16 Mar 2016) New Revision: d7ff6aba4a4081c642a8f230f7c8ba67aed2aa52 https://github.com/groonga/groonga/commit/d7ff6aba4a4081c642a8f230f7c8ba67aed2aa52 Message: load: add more GRN_CANCEL checks Modified files: lib/db.c Modified: lib/db.c (+6 -0) =================================================================== --- lib/db.c 2016-03-16 23:17:07 +0900 (290223f) +++ lib/db.c 2016-03-16 23:24:10 +0900 (40425c7) @@ -13306,11 +13306,17 @@ json_read(grn_ctx *ctx, grn_loader *loader, const char *str, unsigned int str_le case ']' : bracket_close(ctx, loader); loader->stat = GRN_BULK_VSIZE(&loader->level) ? GRN_LOADER_TOKEN : GRN_LOADER_END; + if (ctx->rc == GRN_CANCEL) { + loader->stat = GRN_LOADER_END; + } str++; break; case '}' : brace_close(ctx, loader); loader->stat = GRN_BULK_VSIZE(&loader->level) ? GRN_LOADER_TOKEN : GRN_LOADER_END; + if (ctx->rc == GRN_CANCEL) { + loader->stat = GRN_LOADER_END; + } str++; break; case '+' : case '-' : case '0' : case '1' : case '2' : case '3' : -------------- next part -------------- HTML����������������������������...Download