1592. [bug] configure_view() could leak a dispatch.

diff --git a/CHANGES b/CHANGES
index 0c9f398e3f9f143d0d1fdd0b5a84630e80ba38e6..abb61222783283abc1b8117731cb33263e346da4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1592.  [bug]           configure_view() could leak a dispatch.
+
 1591.  [bug]           libbind: updated to BIND 8.4.5.
 
 1590.  [port]          netbsd: update thread support.

diff --git a/bin/named/server.c b/bin/named/server.c
index 3a0c6acc68cbc9041789f2970d24bc14b8f654bb..5a8a67b48d6fa9587235d7b0ffac9fc6567cdfcb 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.339.2.23 2004/03/09 06:09:19 marka Exp $ */
+/* $Id: server.c,v 1.339.2.24 2004/03/14 22:52:16 marka Exp $ */
 
 #include <config.h>
 
@@ -678,10 +678,6 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
                                      ns_g_socketmgr, ns_g_timermgr,
                                      0, ns_g_dispatchmgr,
                                      dispatch4, dispatch6));
-       if (dispatch4 != NULL)
-               dns_dispatch_detach(&dispatch4);
-       if (dispatch6 != NULL)
-               dns_dispatch_detach(&dispatch6);
 
        /*
         * Set resolver's lame-ttl.
@@ -937,6 +933,10 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
        result = ISC_R_SUCCESS;
 
  cleanup:
+       if (dispatch4 != NULL)
+               dns_dispatch_detach(&dispatch4);
+       if (dispatch6 != NULL)
+               dns_dispatch_detach(&dispatch6);
        if (cmctx != NULL)
                isc_mem_detach(&cmctx);