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

(cherry picked from commit e7b9603ead84761813fd4598303b8e969ab4d7ac)
(cherry picked from commit 84e4b4e53609a45b65c1735337c558713eaaccef)

diff --git a/CHANGES b/CHANGES
index 07d7b6b58a63424824da9a9e1b824d652273cfaa..7918bf0070c91bdd3d04f33667c02015c5742a0e 100644 (file)
--- 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 3cd96a834d02e9718a453bf0c87f968559b32f1a..b9bd9328eb5ffa01810de7d80b4476526f0b8a32 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -9018,9 +9018,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