From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 28 Jan 2014 10:06:38 +0000 (+0100)
Subject: bugfix #548: Double free for answers > 4096
X-Git-Tag: release-1.7.0-rc1~184
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2853eb352b4461e98f2926ace4ea3810cedf4167;p=thirdparty%2Fldns.git

bugfix #548: Double free for answers > 4096

in ldns_resolver_send_pkt.  Thank you sunthought@gmail.com
---

diff --git a/Changelog b/Changelog
index 65c10ed3..e40b1970 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
 TBD
 	* Fix lookup of relative names in ldns_resolver_search.
+	* bugfix #548: Double free for answers > 4096 in ldns_resolver_send_pkt
 
 1.6.17	2014-01-10
 	* Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a
diff --git a/resolver.c b/resolver.c
index 1dff1a2a..97199846 100644
--- a/resolver.c
+++ b/resolver.c
@@ -1126,6 +1126,7 @@ ldns_resolver_send_pkt(ldns_pkt **answer, ldns_resolver *r,
 					ldns_pkt_set_edns_udp_size(query_pkt
 							, 4096);
 					ldns_pkt_free(answer_pkt);
+					answer_pkt = NULL;
 					/* Nameservers should not become 
 					 * unreachable because fragments are
 					 * dropped (network error). We might