1545. [bug] It was possible to leak memory if named was unable to

                        bind to the specified transfer source and TSIG was
                        being used. [RT #10120]

diff --git a/CHANGES b/CHANGES
index 3d00a8809209d538710f0d36772cd9f9e3a09986..48b3fe212d9caf9da3f8c80e4fd062b81f6ba11e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1545.  [bug]           It was possible to leak memory if named was unable to
+                       bind to the specified transfer source and TSIG was
+                       being used. [RT #10120]
+
 1544.  [placeholder]   rt10147
 
 1543.  [placeholder]   rt10147

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index fb8b889255158003beaed7f3ba10f7975e159a20..65ff103346bb7e801ef83db527277137d346d26c 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.402 2003/11/04 05:23:31 marka Exp $ */
+/* $Id: zone.c,v 1.403 2004/01/05 04:21:30 marka Exp $ */
 
 #include <config.h>
 
@@ -3947,11 +3947,11 @@ soa_query(isc_task_t *task, isc_event_t *event) {
                              dns_result_totext(result));
                goto cleanup;
        }
-       if (key != NULL)
-               dns_tsigkey_detach(&key);
        cancel = ISC_FALSE;
 
  cleanup:
+       if (key != NULL)
+               dns_tsigkey_detach(&key);
        if (result != ISC_R_SUCCESS)
                DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_REFRESH);
        if (message != NULL)