Fix: sessiond: handle NULL control output in session descriptor base path getter

[lttng-tools.git] / src / common / session-descriptor.c

diff --git a/src/common/session-descriptor.c b/src/common/session-descriptor.c
index b5fdb0677f8153d00e1c8517f16816e9e02dbb69..208eb46ffa8593bb978a6f7c87a7c83b37661c3b 100644 (file)
--- a/src/common/session-descriptor.c
+++ b/src/common/session-descriptor.c
@@ -1186,8 +1186,12 @@ int lttng_session_descriptor_get_base_path(struct lttng_session_descriptor *dst,
        switch (dst->output_type) {
        case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_NETWORK:
        {
-               *_base_path = dst->output.network.control->subdir[0] ?
-                               dst->output.network.control->subdir : NULL;
+               if (dst->output.network.control &&
+                               dst->output.network.control->subdir[0]) {
+                       *_base_path = dst->output.network.control->subdir;
+               } else {
+                       *_base_path = NULL;
+               }
                break;
        }
        case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_LOCAL: