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.10.0a1~448^2~97^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7b9603ead84761813fd4598303b8e969ab4d7ac;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index 80abb971286..2d5f794b2a5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3517.	[bug]		Reorder destruction to avoid shutdown race. [RT #32777]
+
 3516.	[placeholder]
 
 3515.	[port]		'%T' is not portable in strftime(). [RT #32763]
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 2f3d4cdeffb..d69f5118a37 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -9732,9 +9732,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