unload zone plugin before freeing the zone

Make sure all zone's plugin are unloaded before the zone gets freed.
This makes passing zone metadata like its origin to the plugin
registering function safe, as this garantee that the origin would always
be valid from the plugin lifecycle.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 901336780a19a3ce8938bdeb941a0ea472786ae8..f918eee2089db0f8e543108edd5e892b60bdca20 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1237,6 +1237,8 @@ zone_free(dns_zone_t *zone) {
        REQUIRE(zone->timer == NULL);
        REQUIRE(zone->zmgr == NULL);
 
+       dns_zone_unloadplugins(zone);
+
        isc_refcount_destroy(&zone->references);
        isc_refcount_destroy(&zone->irefs);
 
@@ -1385,7 +1387,6 @@ zone_free(dns_zone_t *zone) {
        if (zone->gluecachestats != NULL) {
                isc_stats_detach(&zone->gluecachestats);
        }
-       dns_zone_unloadplugins(zone);
 
        /* last stuff */
        ZONEDB_DESTROYLOCK(&zone->dblock);