2046. [bug] rbtdb.c:rdataset_setadditional() could cause duplicate

			cleanup [RT #16247].

diff --git a/CHANGES b/CHANGES
index 46c16b3a76f5cc8cf420c7b78fe78fd9c84eb2bb..da997f3500e17ec9959e23f99aa1eb03da2d24f2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2046.  [bug]           rbtdb.c:rdataset_setadditional() could cause duplicate
+                       cleanup [RT #16247].
+
 2044.  [port]          add support for atomic operations for Itanium.
                        [RT #16179]
 

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index ce38d5814bef7ff589f6fddada81064612e3fd2b..91ba5208cf3ae9372c1a4a1806971bb58bba9576 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.196.18.37 2006/06/13 04:54:39 marka Exp $ */
+/* $Id: rbtdb.c,v 1.196.18.38 2006/07/06 06:43:26 jinmei Exp $ */
 
 /*! \file */
 
@@ -6629,10 +6629,12 @@ rdataset_setadditional(dns_rdataset_t *rdataset, dns_rdatasetadditional_t type,
                        acache_cancelentry(rbtdb->common.mctx, newentry,
                                           &newcbarg);
                        dns_acache_detachentry(&newentry);
+               } else {
+                       dns_db_detachnode((dns_db_t *)rbtdb, &newcbarg->node);
+                       dns_db_detach(&newcbarg->db);
+                       isc_mem_put(rbtdb->common.mctx, newcbarg,
+                           sizeof(*newcbarg));
                }
-               dns_db_detachnode((dns_db_t *)rbtdb, &newcbarg->node);
-               dns_db_detach(&newcbarg->db);
-               isc_mem_put(rbtdb->common.mctx, newcbarg, sizeof(*newcbarg));
        }
 
        return (result);