From: Willem Toorop <willem@nlnetlabs.nl>
Date: Fri, 1 Sep 2017 11:23:36 +0000 (+0200)
Subject: Make certain NULL is returned on resolver failure
X-Git-Tag: release-1.7.1-rc1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6167a260cc828130b504edbef86ae2fed2a8239b;p=thirdparty%2Fldns.git

Make certain NULL is returned on resolver failure

with ldns_resolver_search and friends.
Thanks Lars Rohwedder
---

diff --git a/resolver.c b/resolver.c
index 79f50258..a082379d 100644
--- a/resolver.c
+++ b/resolver.c
@@ -1132,6 +1132,7 @@ ldns_resolver_search(const ldns_resolver *r,const  ldns_rdf *name,
 	if (ldns_resolver_search_status(&pkt, (ldns_resolver *)r,
 				name, t, c, flags) != LDNS_STATUS_OK) {
 		ldns_pkt_free(pkt);
+		return NULL;
 	}
 	return pkt;
 }
@@ -1165,6 +1166,7 @@ ldns_resolver_query(const ldns_resolver *r, const ldns_rdf *name,
 	if (ldns_resolver_query_status(&pkt, (ldns_resolver *)r,
 				name, t, c, flags) != LDNS_STATUS_OK) {
 		ldns_pkt_free(pkt);
+		return NULL;
 	}
 	return pkt;
 }
@@ -1240,6 +1242,7 @@ ldns_resolver_send_pkt(ldns_pkt **answer, ldns_resolver *r,
 				    ldns_pkt_tc(answer_pkt)) {
 					ldns_resolver_set_usevc(r, true);
 					ldns_pkt_free(answer_pkt);
+					answer_pkt = NULL;
 					stat = ldns_send(&answer_pkt, r, query_pkt);
 					ldns_resolver_set_usevc(r, false);
 				}