From: Willy Tarreau <w@1wt.eu>
Date: Thu, 20 Sep 2018 09:12:58 +0000 (+0200)
Subject: BUILD: http: address a couple of null-deref warnings at -Wextra
X-Git-Tag: v1.9-dev3~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b05e48a54d67f5a4013ab6af48680252505851a6;p=thirdparty%2Fhaproxy.git

BUILD: http: address a couple of null-deref warnings at -Wextra

These two warnings are caused by the use of objt_server() without
checking its result. These are turned to __objt_server() which is
safe there.
---

diff --git a/src/proto_http.c b/src/proto_http.c
index 22eab8b30a..c17d67ca39 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -500,7 +500,7 @@ void http_perform_server_redirect(struct stream *s, struct stream_interface *si)
 	trash.data = strlen(HTTP_302);
 	memcpy(trash.area, HTTP_302, trash.data);
 
-	srv = objt_server(s->target);
+	srv = __objt_server(s->target);
 
 	/* 2: add the server's prefix */
 	if (trash.data + srv->rdr_len > trash.size)
@@ -5367,7 +5367,7 @@ int http_process_res_common(struct stream *s, struct channel *rep, int an_bit, s
 			goto return_bad_resp;
 
 		txn->flags &= ~TX_SCK_MASK;
-		if (objt_server(s->target)->cookie && (s->flags & SF_DIRECT))
+		if (__objt_server(s->target)->cookie && (s->flags & SF_DIRECT))
 			/* the server did not change, only the date was updated */
 			txn->flags |= TX_SCK_UPDATED;
 		else