null+****@clear*****
null+****@clear*****
2012年 2月 15日 (水) 19:16:13 JST
Daijiro MORI 2012-02-15 19:16:13 +0900 (Wed, 15 Feb 2012) New Revision: 84b9d4fc6331b38e4c4f9ce8cd17c548b419350b Log: grn_ii_buffer: add a null pointer check. Modified files: lib/ii.c Modified: lib/ii.c (+6 -4) =================================================================== --- lib/ii.c 2012-02-15 18:48:44 +0900 (d14f784) +++ lib/ii.c 2012-02-15 19:16:13 +0900 (93eb778) @@ -7031,12 +7031,14 @@ grn_ii_buffer_close(grn_ctx *ctx, grn_ii_buffer *ii_buffer) if (flags & GRN_OBJ_TABLE_PAT_KEY) { grn_pat_cache_disable(ctx, (grn_pat *)ii_buffer->ii->lexicon); } - for (i = 0; i < ii_buffer->nblocks; i++) { - if (ii_buffer->blocks[i].buffer) { - GRN_FREE(ii_buffer->blocks[i].buffer); + if (ii_buffer->blocks) { + for (i = 0; i < ii_buffer->nblocks; i++) { + if (ii_buffer->blocks[i].buffer) { + GRN_FREE(ii_buffer->blocks[i].buffer); + } } + GRN_FREE(ii_buffer->blocks); } - GRN_FREE(ii_buffer->blocks); GRN_FREE(ii_buffer); return ctx->rc; }