From: Mark Andrews Date: Sun, 7 Mar 2021 20:06:57 +0000 (+1100) Subject: Silence CID 329157: Dereference before null check in lib/dns/journal.c X-Git-Tag: v9.17.11~10^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=405440590947fdc881ffc1bf2cd1ed5c2026a03b;p=thirdparty%2Fbind9.git Silence CID 329157: Dereference before null check in lib/dns/journal.c *** CID 329157: Null pointer dereferences (REVERSE_INULL) /lib/dns/journal.c: 754 in journal_open() 748 j->header.index_size * sizeof(journal_rawpos_t)); 749 } 750 if (j->index != NULL) { 751 isc_mem_put(j->mctx, j->index, 752 j->header.index_size * sizeof(journal_pos_t)); 753 } CID 329157: Null pointer dereferences (REVERSE_INULL) Null-checking "j->filename" suggests that it may be null, but it has already been dereferenced on all paths leading to the check. 754 if (j->filename != NULL) { 755 isc_mem_free(j->mctx, j->filename); 756 } 757 if (j->fp != NULL) { 758 (void)isc_stdio_close(j->fp); 759 } --- diff --git a/lib/dns/journal.c b/lib/dns/journal.c index fad38c0f579..741da8c294c 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -751,9 +751,7 @@ failure: isc_mem_put(j->mctx, j->index, j->header.index_size * sizeof(journal_pos_t)); } - if (j->filename != NULL) { - isc_mem_free(j->mctx, j->filename); - } + isc_mem_free(j->mctx, j->filename); if (j->fp != NULL) { (void)isc_stdio_close(j->fp); }