From: Mark Andrews <marka@isc.org>
Date: Mon, 16 Dec 2019 07:13:05 +0000 (+1100)
Subject: Call dns_dbiterator_destroy earlier to prevent potential deadlock.
X-Git-Tag: v9.14.10~39^2~3
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=37567e0106ba5e0a26c5171104cd27800d13fa00;p=thirdparty%2Fbind9.git

Call dns_dbiterator_destroy earlier to prevent potential deadlock.

(cherry picked from commit 9d8f9cc8f282843d6de6a00815affa51eea9af7c)
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 92a61f92cc4..3e6c0888f60 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15414,6 +15414,8 @@ receive_secure_db(isc_task_t *task, isc_event_t *event) {
 		dns_db_detachnode(db, &node);
 	}
 
+	dns_dbiterator_destroy(&dbiterator);
+
 	/*
 	 * Call restore_nsec3param() to create private-type records from
 	 * the old nsec3 parameters and insert them into db