From aa6e560fbd044d7a42ecfa7c13e124ae9cfdce90 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 6 Sep 2001 00:23:19 +0000 Subject: [PATCH] 980. [bug] Incoming zone transfers restarting after an error could trigger an assertion failure. [RT #1692] --- CHANGES | 4 ++++ lib/dns/xfrin.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 3e5db38e5d..b128ce5dc7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ + 980. [bug] Incoming zone transfers restarting after an error + could trigger an assertion failure. [RT #1692] + + --- 9.2.0rc2 released --- 978. [bug] dns_db_attachversion() had an invalid REQUIRE() diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index 20039f4385..fe1f5e5dc3 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: xfrin.c,v 1.124 2001/08/08 22:54:46 gson Exp $ */ +/* $Id: xfrin.c,v 1.124.2.1 2001/09/06 00:23:19 marka Exp $ */ #include @@ -647,8 +647,10 @@ xfrin_reset(dns_xfrin_ctx_t *xfr) { if (xfr->ixfr.journal != NULL) dns_journal_destroy(&xfr->ixfr.journal); - if (xfr->axfr.add_private != NULL) + if (xfr->axfr.add_private != NULL) { (void)dns_db_endload(xfr->db, &xfr->axfr.add_private); + xfr->axfr.add_func = NULL; + } if (xfr->tcpmsg_valid) { dns_tcpmsg_invalidate(&xfr->tcpmsg);