]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: log: be sure not to dereference a null stream for a target
authorWilly Tarreau <w@1wt.eu>
Wed, 5 Sep 2018 13:30:16 +0000 (15:30 +0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 5 Sep 2018 18:01:23 +0000 (20:01 +0200)
The supported targets are either a server or an applet, so both are
NULL if the stream is NULL.

src/log.c

index ca2f849c07f4b716fb9e546db31b36d66b410913..7ac555d0793849ae97f03d8aaa78609848e6e96f 100644 (file)
--- 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)