From: Willy Tarreau <w@1wt.eu>
Date: Wed, 5 Sep 2018 13:30:16 +0000 (+0200)
Subject: MINOR: log: be sure not to dereference a null stream for a target
X-Git-Tag: v1.9-dev2~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1809dfdafa84a0c70803e85e52f6c624ed32352;p=thirdparty%2Fhaproxy.git

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.
---

diff --git a/src/log.c b/src/log.c
index ca2f849c07..7ac555d079 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)