From: Mark Andrews <marka@isc.org>
Date: Thu, 24 May 2007 02:57:42 +0000 (+0000)
Subject: 2194.   [bug]           Close journal before calling 'done' in xfrin.c.
X-Git-Tag: v9.2.0b1^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bed4ec6943609ef05f01b5043bf03c980e4019c;p=thirdparty%2Fbind9.git

2194.   [bug]           Close journal before calling 'done' in xfrin.c.
---

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 822eacfe6d2..45797615180 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.124.2.15 2007/05/24 01:56:01 tbox Exp $ */
+/* $Id: xfrin.c,v 1.124.2.16 2007/05/24 02:57:42 marka Exp $ */
 
 #include <config.h>
 
@@ -673,6 +673,11 @@ xfrin_fail(dns_xfrin_ctx_t *xfr, isc_result_t result, const char *msg) {
 			result = DNS_R_BADIXFR;
 	}
 	xfrin_cancelio(xfr);
+	/*
+	 * Close the journal.
+	 */
+	if (xfr->ixfr.journal != NULL)
+		dns_journal_destroy(&xfr->ixfr.journal);
 	if (xfr->done != NULL) {
 		(xfr->done)(xfr->zone, result);
 		xfr->done = NULL;