1744. [bug] If tuple2msgname() failed to convert a tuple to

                        a name a REQUIRE could be triggered. [RT #12796]

diff --git a/CHANGES b/CHANGES
index 57729df6c91a56491deb30ae88c2a47438a16851..9a8d8dd6f6ee44679fbc72a092e81ca4d316217c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1744.  [bug]           If tuple2msgname() failed to convert a tuple to
+                       a name a REQUIRE could be triggered. [RT #12796]
+
 1743.  [placeholder]   rt12790
 
 1742.  [placeholder]   rt12788

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index efd5090d76c538c11c3415cae1d4906f354f1e7c..c1f62a78d5fc04935531f7b6202d6430a078ff7f 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.137 2004/09/16 04:54:03 marka Exp $ */
+/* $Id: xfrin.c,v 1.138 2004/10/13 22:24:18 marka Exp $ */
 
 #include <config.h>
 
@@ -923,9 +923,10 @@ tuple2msgname(dns_difftuple_t *tuple, dns_message_t *msg, dns_name_t **target)
 
  failure:
 
-       if (rds != NULL)
+       if (rds != NULL) {
                dns_rdataset_disassociate(rds);
                dns_message_puttemprdataset(msg, &rds);
+       }
        if (rdl != NULL) {
                ISC_LIST_UNLINK(rdl->rdata, rdata, link);
                dns_message_puttemprdatalist(msg, &rdl);