X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=32792926928d6abb6ebed749460e3a970307c2f3;hp=63bfb6c523add6a4058d3867a39581274cb55374;hb=d7a20fcf33143103aa58cf1b48f4507af2d09e70;hpb=dd95933f8371a8c81ffc1dc5b306f2263f1ff808

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 63bfb6c52..327929269 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(
@@ -905,21 +905,20 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
 		if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 			ERR("Error removing subdirectory '%s' file when deleting chunk",
 				old_path);
-			ret = -1;
 			goto end;
 		}
+	} else {
+		/* Unexpected !old_path && !path. */
+		status = LTTNG_TRACE_CHUNK_STATUS_INVALID_ARGUMENT;
+		goto end;
 	}
 
 skip_move:
-	if (path) {
-		new_path = strdup(path);
-		if (!new_path) {
-			ERR("Failed to allocate new trace chunk path");
-			status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
-			goto end;
-		}
-	} else {
-		new_path = NULL;
+	new_path = strdup(path);
+	if (!new_path) {
+		ERR("Failed to allocate new trace chunk path");
+		status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
+		goto end;
 	}
 	free(chunk->path);
 	chunk->path = new_path;
@@ -1031,7 +1030,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_as_owner(
 		status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
 		goto end;
 	}
-	if (chunk->path[0] != '\0') {
+	if (chunk->path && chunk->path[0] != '\0') {
 		ret = lttng_directory_handle_create_subdirectory_as_user(
 				session_output_directory,
 				chunk->path,
@@ -1495,7 +1494,7 @@ end:
 	return status;
 }
 
-LTTNG_HIDDEN
+static
 int lttng_trace_chunk_remove_subdirectory_recursive(struct lttng_trace_chunk *chunk,
 		const char *path)
 {