From: Willy Tarreau Date: Thu, 20 Sep 2018 09:15:27 +0000 (+0200) Subject: BUILD: dns: fix null-deref build warning at -Wextra X-Git-Tag: v1.9-dev3~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=433c16ffea78260fada06ca7a110acdc63ce6a33;p=thirdparty%2Fhaproxy.git BUILD: dns: fix null-deref build warning at -Wextra Like for the other checks, the type is being tested just before calling objt_{server,dns_srvrq}() so let's use the unguarded version instead to silence the warning. --- diff --git a/src/dns.c b/src/dns.c index 16a2c17c1f..90a937c04a 100644 --- a/src/dns.c +++ b/src/dns.c @@ -1434,12 +1434,12 @@ void dns_unlink_resolution(struct dns_requester *requester) /* Move hostname_dn related pointers to the next requester */ switch (obj_type(req->owner)) { case OBJ_TYPE_SERVER: - res->hostname_dn = objt_server(req->owner)->hostname_dn; - res->hostname_dn_len = objt_server(req->owner)->hostname_dn_len; + res->hostname_dn = __objt_server(req->owner)->hostname_dn; + res->hostname_dn_len = __objt_server(req->owner)->hostname_dn_len; break; case OBJ_TYPE_SRVRQ: - res->hostname_dn = objt_dns_srvrq(req->owner)->hostname_dn; - res->hostname_dn_len = objt_dns_srvrq(req->owner)->hostname_dn_len; + res->hostname_dn = __objt_dns_srvrq(req->owner)->hostname_dn; + res->hostname_dn_len = __objt_dns_srvrq(req->owner)->hostname_dn_len; break; default: res->hostname_dn = NULL;