ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

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

Browse Source 
[RT #18316]
This commit is contained in:
Mark Andrews
2008-09-25 02:09:08 +00:00
parent fc78d2e4b2
commit cbec5ee72c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -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]

10
lib/dns/journal.c
View File

@@ -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 <config.h>
@@ -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 ?