X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsession-descriptor.c;h=208eb46ffa8593bb978a6f7c87a7c83b37661c3b;hb=ef4b086ef18cd4128c52c4bf58e5ce64d2df0ee6;hp=b5fdb0677f8153d00e1c8517f16816e9e02dbb69;hpb=6fa5fe7cc78bea0b0bba154a0f911d3df530e18f;p=lttng-tools.git

diff --git a/src/common/session-descriptor.c b/src/common/session-descriptor.c
index b5fdb0677..208eb46ff 100644
--- 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: