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

diff --git a/CHANGES b/CHANGES
index 80abb971286d6cd3de69ebb4a7d873cfc3b4df10..2d5f794b2a5265b1fab7c909109887a0e920abf1 100644 (file)
--- 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 2f3d4cdeffbf8a115b73f4e496ed3160ee5050fd..d69f5118a372f542349c4ebfdfb29487a245092f 100644 (file)
--- 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