From b05e48a54d67f5a4013ab6af48680252505851a6 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 20 Sep 2018 11:12:58 +0200 Subject: [PATCH] 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. --- src/proto_http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/proto_http.c b/src/proto_http.c index 22eab8b30..c17d67ca3 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