mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: log: be sure not to dereference a null stream for a target

Browse Source 
The supported targets are either a server or an applet, so both are
NULL if the stream is NULL.
This commit is contained in:
Willy Tarreau 2018-09-05 15:30:16 +02:00
parent d4f9166f4e
commit e1809dfdaf
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/log.c
View File

@ -1913,7 +1913,7 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
break; break;
case LOG_FMT_SERVER: // %s case LOG_FMT_SERVER: // %s
switch (obj_type(s->target)) { switch (obj_type(s ? s->target : NULL)) {
case OBJ_TYPE_SERVER: case OBJ_TYPE_SERVER:
src = objt_server(s->target)->id; src = objt_server(s->target)->id;
break; break;
@ -2109,7 +2109,7 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
break; break;
case LOG_FMT_SRVCONN: // %sc case LOG_FMT_SRVCONN: // %sc
ret = ultoa_o(objt_server(s->target) ? ret = ultoa_o(objt_server(s ? s->target : NULL) ?
objt_server(s->target)->cur_sess : objt_server(s->target)->cur_sess :
0, tmplog, dst + maxsize - tmplog); 0, tmplog, dst + maxsize - tmplog);
if (ret == NULL) if (ret == NULL)