From cbec5ee72cd65e6b0ffa482ac3485e63815eae1f Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 25 Sep 2008 02:09:08 +0000 Subject: [PATCH] 2453. [bug] Remove NULL pointer dereference in dns_journal_print(). [RT #18316] --- CHANGES | 3 +++ lib/dns/journal.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 2fceb88bc2..8b431c8570 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +2453. [bug] Remove NULL pointer dereference in dns_journal_print(). + [RT #18316] + 2449. [bug] libbind: Out of bounds reference in dns_ho.c:addrsort. [RT #18044] diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 6cfb5aff5a..02346d8c74 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: journal.c,v 1.86.18.12 2007/09/07 05:21:41 marka Exp $ */ +/* $Id: journal.c,v 1.86.18.13 2008/09/25 02:09:08 marka Exp $ */ #include @@ -1367,7 +1367,7 @@ dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) { if (result != ISC_R_SUCCESS) { isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR, "journal open failure: %s: %s", - isc_result_totext(result), j->filename); + isc_result_totext(result), filename); return (result); } @@ -1405,9 +1405,9 @@ dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) { if (n_soa == 3) n_soa = 1; if (n_soa == 0) { - isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR, - "%s: journal file corrupt: missing " - "initial SOA", j->filename); + isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR, + "%s: journal file corrupt: missing " + "initial SOA", j->filename); FAIL(ISC_R_UNEXPECTED); } CHECK(dns_difftuple_create(diff.mctx, n_soa == 1 ?