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

1638. [bug] "ixfr-from-differences" could generate a REQUIRE

Browse Source 
failure if the journal open failed. [RT #11347]
This commit is contained in:
Mark Andrews
2004-05-14 05:08:00 +00:00
parent 2cd8fa3ef9
commit 5ba04ba7a9
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@@ -1,7 +1,8 @@
1639. [func] Initial dlv system test.
1638. [placeholder] rt113347
1638. [bug] "ixfr-from-differences" could generate a REQUIRE
failure if the journal open failed. [RT #11347]
1637. [bug] Node reference leak on error in addnoqname().
1636. [bug] The dump done callback could get ISC_R_SUCCESS even if

18
lib/dns/journal.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: journal.c,v 1.87 2004/05/11 22:20:13 marka Exp $ */
/* $Id: journal.c,v 1.88 2004/05/14 05:08:00 marka Exp $ */
#include <config.h>
@@ -1822,10 +1822,16 @@ dns_db_diff(isc_mem_t *mctx,
dns_fixedname_init(&fixname[0]);
dns_fixedname_init(&fixname[1]);
CHECK(dns_journal_open(mctx, journal_filename, ISC_TRUE, &journal));
result = dns_journal_open(mctx, journal_filename, ISC_TRUE, &journal);
if (result != ISC_R_SUCCESS)
return (result);
CHECK(dns_db_createiterator(db[0], ISC_FALSE, &dbit[0]));
CHECK(dns_db_createiterator(db[1], ISC_FALSE, &dbit[1]));
result = dns_db_createiterator(db[0], ISC_FALSE, &dbit[0]);
if (result != ISC_R_SUCCESS)
goto cleanup_journal;
result = dns_db_createiterator(db[1], ISC_FALSE, &dbit[1]);
if (result != ISC_R_SUCCESS)
goto cleanup_interator0;
itresult[0] = dns_dbiterator_first(dbit[0]);
itresult[1] = dns_dbiterator_first(dbit[1]);
@@ -1898,8 +1904,10 @@ dns_db_diff(isc_mem_t *mctx,
failure:
dns_diff_clear(&resultdiff);
dns_dbiterator_destroy(&dbit[0]);
dns_dbiterator_destroy(&dbit[1]);
cleanup_interator0:
dns_dbiterator_destroy(&dbit[0]);
cleanup_journal:
dns_journal_destroy(&journal);
return (result);
}