From: Willem Toorop <willem@nlnetlabs.nl>
Date: Mon, 16 Oct 2017 08:41:51 +0000 (+0200)
Subject: bugfix #1569:  Possible NULL pointer dereference
X-Git-Tag: release-1.7.1-rc1~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=792c5c1d57eb5bdae777f7b41f82b0b237c5fe1e;p=thirdparty%2Fldns.git

bugfix #1569:  Possible NULL pointer dereference

Thanks Bill Parker
---

diff --git a/Changelog b/Changelog
index a86c7673..45f03691 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,5 @@
 1.7.1	????-??-??
-	* bugfix #1566, #1568: Possible NULL Pointer Dereference
+	* bugfix #1566, #1568, #1569: Possible NULL Pointer Dereferences
 	  Thanks Bill Parker
 	* bugfix #1260: Anticipate strchr returning NULL on unfound char
 	  Thanks Stephan Zeisberg
diff --git a/resolver.c b/resolver.c
index a082379d..2be9e395 100644
--- a/resolver.c
+++ b/resolver.c
@@ -1180,6 +1180,7 @@ ldns_resolver_backup_rtt(ldns_resolver *r)
 	if (old_rtt && ldns_resolver_nameserver_count(r)) {
 		new_rtt = LDNS_XMALLOC(size_t
 				, ldns_resolver_nameserver_count(r));
+		if (!new_rtt) return NULL;
 		memcpy(new_rtt, old_rtt, sizeof(size_t)
 				* ldns_resolver_nameserver_count(r));
 		ldns_resolver_set_rtt(r, new_rtt);