From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 15 Sep 2017 09:55:45 +0000 (+0200)
Subject: BUG/MINOR: dns: Fix check on nameserver in snr_resolution_cb
X-Git-Tag: v1.8-dev3~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3bbd65b23eba214abf07d5728fe74909fc5d286d;p=thirdparty%2Fhaproxy.git

BUG/MINOR: dns: Fix check on nameserver in snr_resolution_cb

snr_resolution_cb can be called with <nameserver> parameter set to NULL. So we
must check it before using it. This is done most of time, except when we deal
with invalid DNS response.
---

diff --git a/src/server.c b/src/server.c
index ec2dbe8943..ebfe0e5c02 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3990,10 +3990,11 @@ int snr_resolution_cb(struct dns_requester *requester, struct dns_nameserver *na
 	return 1;
 
  invalid:
-	if (nameserver)
+	if (nameserver) {
 		nameserver->counters.invalid += 1;
-	if (resolution->nb_responses >= nameserver->resolvers->count_nameservers)
-		goto update_status;
+		if (resolution->nb_responses >= nameserver->resolvers->count_nameservers)
+			goto update_status;
+	}
 
 	snr_update_srv_status(s, has_no_ip);
 	return 0;