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

3517.   [bug]           Reorder destruction to avoid shutdown race. [RT #32777]
---

diff --git a/CHANGES b/CHANGES
index b2352f1d465..a07520f045c 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]
 
 3509.	[cleanup]	Added a product line to version file to allow for
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index a8e19546990..a0826da6881 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -6956,9 +6956,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