2453. [bug] Remove NULL pointer dereference in dns_journal_print().

                        [RT #18316]

diff --git a/CHANGES b/CHANGES
index 01bc7cd5f8b69fe754bf396e17d15db9f8cc6546..3378a1b9c12f884a1029f487350c1186d6dcdb6e 100644 (file)
--- 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 b7e81f7ccec7927f5d8db02f863efeeb35890416..b59982dd63d15674873b91d1fb950ae19e8725b9 100644 (file)
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journal.c,v 1.77.2.1.10.22 2007/09/07 05:25:37 marka Exp $ */
+/* $Id: journal.c,v 1.77.2.1.10.23 2008/09/25 02:10:01 marka Exp $ */
 
 #include <config.h>
 
@@ -1372,7 +1372,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);
        }
 
@@ -1410,9 +1410,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 ?