1824. [bug] Memory leak on dns_zone_setdbtype() failure.

                        [RT #13510]

diff --git a/CHANGES b/CHANGES
index 666ee3a29531fe009c7b74852abbe4efe4f383bc..720ef4eaa2a3552eb271eaf7c51fe7f0b70500ce 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1824.  [bug]           Memory leak on dns_zone_setdbtype() failure.
+                       [RT #13510]
+
 1823.  [bug]           Wrong macro used to check for point to point interface.
                        [RT#13418]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 9dcea3dae181fccda882f095530ff393cb16129c..7bbaec0d5c16187a3e158daa551604ebf32d8922 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.431 2005/02/10 05:53:42 marka Exp $ */
+/* $Id: zone.c,v 1.432 2005/03/15 00:20:59 marka Exp $ */
 
 #include <config.h>
 
@@ -606,7 +606,8 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
 
  free_mutex:
        DESTROYLOCK(&zone->lock);
-       return (ISC_R_NOMEMORY);
+       isc_mem_putanddetach(&zone->mctx, zone, sizeof(*zone));
+       return (result);
 }
 
 /*