From: Mark Andrews <marka@isc.org>
Date: Wed, 6 Mar 2013 20:13:38 +0000 (+1100)
Subject: 3517.   [bug]           Reorder destruction to avoid shutdown race. [RT #32777]
X-Git-Tag: v9.9.3b2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84e4b4e53609a45b65c1735337c558713eaaccef;p=thirdparty%2Fbind9.git

3517.   [bug]           Reorder destruction to avoid shutdown race. [RT #32777]
(cherry picked from commit e7b9603ead84761813fd4598303b8e969ab4d7ac)
---

diff --git a/CHANGES b/CHANGES
index 0b7bb6d662d..77af222c616 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3517.	[bug]		Reorder destruction to avoid shutdown race. [RT #32777]
+
 3515.	[port]		'%T' is not portable in strftime(). [RT #32763]
 
 3514.	[bug]		The ranges for valid key sizes in ddns-confgen and
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 90b33b47649..47a9df58d13 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -9602,9 +9602,9 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) {
 	dns_message_destroy(&message);
  cleanup:
 	UNLOCK_ZONE(notify->zone);
+	isc_event_free(&event);
 	if (result != ISC_R_SUCCESS)
 		notify_destroy(notify, ISC_FALSE);
-	isc_event_free(&event);
 }
 
 static void