X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=2ffa75078779b7d0b9986696f5643267ca5ea7aa;hp=453bf6d20fa5625f04d76a3da2eacd87702c62db;hb=8d382dd4d4e95ea6ff88d6bd9f8a8fc85970ee3b;hpb=d37856b8d3033144818786de1c5c5b898fe2946e

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 453bf6d20..2ffa75078 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -40,6 +40,7 @@
 #include <urcu/rculist.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <strings.h>
 
 #include <lttng/lttng.h>
 #include <common/common.h>
@@ -1156,21 +1157,24 @@ send_reply:
 		}
 	} else {
 		const uint32_t output_path_length =
-				strlen(session->output_path) + 1;
+				session ? strlen(session->output_path) + 1 : 0;
 
 		reply.output_path_length = htobe32(output_path_length);
-		ret = lttng_dynamic_buffer_append(&reply_payload, &reply,
-				sizeof(reply));
+		ret = lttng_dynamic_buffer_append(
+				&reply_payload, &reply, sizeof(reply));
 		if (ret) {
 			ERR("Failed to append \"create session\" command reply header to payload buffer");
 			goto end;
 		}
 
-		ret = lttng_dynamic_buffer_append(&reply_payload,
-				session->output_path, output_path_length);
-		if (ret) {
-			ERR("Failed to append \"create session\" command reply path to payload buffer");
-			goto end;
+		if (output_path_length) {
+			ret = lttng_dynamic_buffer_append(&reply_payload,
+					session->output_path,
+					output_path_length);
+			if (ret) {
+				ERR("Failed to append \"create session\" command reply path to payload buffer");
+				goto end;
+			}
 		}
 	}
 
@@ -2385,13 +2389,6 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 		}
 	}
 
-	ret = session_init_output_directory_handle(
-			conn->session, &session_output);
-	if (ret) {
-		reply_code = LTTNG_ERR_CREATE_DIR_FAIL;
-		goto end;
-	}
-
 	chunk_status = lttng_trace_chunk_set_credentials_current_user(chunk);
 	if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 		reply_code = LTTNG_ERR_UNK;
@@ -2399,7 +2396,14 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 		goto end;
 	}
 
+	ret = session_init_output_directory_handle(
+			conn->session, &session_output);
+	if (ret) {
+		reply_code = LTTNG_ERR_CREATE_DIR_FAIL;
+		goto end;
+	}
 	chunk_status = lttng_trace_chunk_set_as_owner(chunk, &session_output);
+	lttng_directory_handle_fini(&session_output);
 	if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 		reply_code = LTTNG_ERR_UNK;
 		ret = -1;
@@ -2455,7 +2459,6 @@ end:
 end_no_reply:
 	lttng_trace_chunk_put(chunk);
 	lttng_trace_chunk_put(published_chunk);
-	lttng_directory_handle_fini(&session_output);
 	return ret;
 }