X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=ea952220b880ad4a12e106a13c90973cfdda1d19;hp=6039f63761b532ac36c2464559b94a5d008cc2a8;hb=a3a75bf4721736ec16c30ee70de95e773fedf53b;hpb=f3ce6f5d9f5cfbe70898ca94efb3c8b31968534d

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 6039f6376..ea952220b 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -766,7 +766,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
 		goto skip_move;
 	}
 
-	if (old_path[0] != '\0' && path[0] != '\0') {
+	if (old_path && old_path[0] != '\0' && path[0] != '\0') {
 		/* Rename chunk directory. */
 		ret = lttng_directory_handle_rename_as_user(
 			chunk->session_output_directory,
@@ -804,7 +804,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
 		 */
 		chunk->chunk_directory = rename_directory;
 		rename_directory = NULL;
-	} else if (old_path[0] == '\0') {
+	} else if (old_path && old_path[0] == '\0') {
 		size_t i, count = lttng_dynamic_pointer_array_get_count(
 				&chunk->top_level_directories);
 
@@ -859,7 +859,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
 		 */
 		chunk->chunk_directory = rename_directory;
 		rename_directory = NULL;
-	} else {
+	} else if (old_path) {
 		size_t i, count = lttng_dynamic_pointer_array_get_count(
 				&chunk->top_level_directories);
 		const bool reference_acquired = lttng_directory_handle_get(
@@ -908,6 +908,10 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
 			ret = -1;
 			goto end;
 		}
+	} else {
+		/* Unexpected !old_path && !path. */
+		status = LTTNG_TRACE_CHUNK_STATUS_INVALID_ARGUMENT;
+		goto end;
 	}
 
 skip_move: