Kouhei Sutou
null+****@clear*****
Thu Aug 29 10:00:05 JST 2013
Kouhei Sutou 2013-08-29 10:00:05 +0900 (Thu, 29 Aug 2013) New Revision: 0016ce04ca5c6cd0b7caf8b8c74fa2dbf94916f8 https://github.com/groonga/groonga/commit/0016ce04ca5c6cd0b7caf8b8c74fa2dbf94916f8 Message: Add missing NULL reset after free() Modified files: lib/ii.c Modified: lib/ii.c (+8 -2) =================================================================== --- lib/ii.c 2013-08-28 11:18:04 +0900 (42a4e7b) +++ lib/ii.c 2013-08-29 10:00:05 +0900 (c23ddb5) @@ -1757,7 +1757,10 @@ grn_p_decv(grn_ctx *ctx, uint8_t *data, uint32_t data_size, datavec *dv, uint32_ df >>= 1; size = nreq == dvlen ? data_size : df * nreq; if (dv[dvlen].data < dv[0].data + size) { - if (dv[0].data) { GRN_FREE(dv[0].data); } + if (dv[0].data) { + GRN_FREE(dv[0].data); + dv[0].data = NULL; + } if (!(rp = GRN_MALLOC(size * sizeof(uint32_t)))) { return 0; } dv[dvlen].data = rp + size; } else { @@ -1783,7 +1786,10 @@ grn_p_decv(grn_ctx *ctx, uint8_t *data, uint32_t data_size, datavec *dv, uint32_ } size = df * nreq + (nreq == dvlen ? rest : 0); if (dv[dvlen].data < dv[0].data + size) { - if (dv[0].data) { GRN_FREE(dv[0].data); } + if (dv[0].data) { + GRN_FREE(dv[0].data); + dv[0].data = NULL; + } if (!(rp = GRN_MALLOC(size * sizeof(uint32_t)))) { return 0; } dv[dvlen].data = rp + size; } else { -------------- next part -------------- HTML����������������������������...Download