RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-23 23:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2018-09-20 11:12:58 +02:00
parent b8d42d0210
commit b05e48a54d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/proto_http.c
View File

@ -500,7 +500,7 @@ void http_perform_server_redirect(struct stream *s, struct stream_interface *si)
trash.data = strlen(HTTP_302); trash.data = strlen(HTTP_302);
memcpy(trash.area, HTTP_302, trash.data); memcpy(trash.area, HTTP_302, trash.data);
srv = objt_server(s->target); srv = __objt_server(s->target);
/* 2: add the server's prefix */ /* 2: add the server's prefix */
if (trash.data + srv->rdr_len > trash.size) 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; goto return_bad_resp;
txn->flags &= ~TX_SCK_MASK; 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 */ /* the server did not change, only the date was updated */
txn->flags |= TX_SCK_UPDATED; txn->flags |= TX_SCK_UPDATED;
else else