1948. [bug] If was possible to trigger a REQUIRE failure in

                        xfrin.c:maybe_free() if named ran out of memory.
                        [RT #15568]

CHANGES

+1948.	[bug]		If was possible to trigger a REQUIRE failure in
+			xfrin.c:maybe_free() if named ran out of memory.
+			[RT #15568]
+
 1947.	[func]		It is now possible to configure named to accept
 			expired RRSIGs.  Default "dnssec-accept-expired no;".
 			Setting "dnssec-accept-expired yes;" leaves named

lib/dns/xfrin.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.142 2005/11/03 22:59:53 marka Exp $ */
+/* $Id: xfrin.c,v 1.143 2006/01/04 03:03:11 marka Exp $ */
 
 /*! \file */
 
@@ -799,7 +799,18 @@ xfrin_create(isc_mem_t *mctx,
 	return (ISC_R_SUCCESS);
 
  failure:
-	xfrin_fail(xfr, result, "failed creating transfer context");
+	if (xfr->timer != NULL)
+		isc_timer_detach(&xfr->timer);
+	if (dns_name_dynamic(&xfr->name))
+		dns_name_free(&xfr->name, xfr->mctx);
+	if (xfr->tsigkey != NULL)
+		dns_tsigkey_detach(&xfr->tsigkey);
+	if (xfr->db != NULL)
+		dns_db_detach(&xfr->db);
+	isc_task_detach(&xfr->task);
+	dns_zone_idetach(&xfr->zone);
+	isc_mem_put(mctx, xfr, sizeof(*xfr));
+
 	return (result);
 }