]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: dns: fix null-deref build warning at -Wextra
authorWilly Tarreau <w@1wt.eu>
Thu, 20 Sep 2018 09:15:27 +0000 (11:15 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 20 Sep 2018 09:42:15 +0000 (11:42 +0200)
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.

src/dns.c

index 16a2c17c1fcf97fecbe8e471841ee84fc0349a5e..90a937c04ac38850a870137945d66812a36f756f 100644 (file)
--- 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;