From e1809dfdafa84a0c70803e85e52f6c624ed32352 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 5 Sep 2018 15:30:16 +0200 Subject: [PATCH] MINOR: log: be sure not to dereference a null stream for a target The supported targets are either a server or an applet, so both are NULL if the stream is NULL. --- src/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/log.c b/src/log.c index ca2f849c0..7ac555d07 100644 --- a/src/log.c +++ b/src/log.c @@ -1913,7 +1913,7 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t break; case LOG_FMT_SERVER: // %s - switch (obj_type(s->target)) { + switch (obj_type(s ? s->target : NULL)) { case OBJ_TYPE_SERVER: src = objt_server(s->target)->id; break; @@ -2109,7 +2109,7 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t break; 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 : 0, tmplog, dst + maxsize - tmplog); if (ret == NULL)