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

diff --git a/CHANGES b/CHANGES
index b2352f1d4650cf8ceb76b52f19f6cd872656b2e2..a07520f045cc7a2de85808814f7186400cff3fba 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]
 
 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 a8e195469901c9463f2eacad96058ff8ed55050d..a0826da6881d90fb92d38d50f09f55f611827bbd 100644 (file)
--- 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