From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Fri, 31 Jan 2020 22:51:04 +0000 (-0500)
Subject: Clean-up: trace-chunk: remove unreachable code
X-Git-Tag: v2.12.0-rc1~12
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f3ce6f5d9f5cfbe70898ca94efb3c8b31968534d;p=lttng-tools.git

Clean-up: trace-chunk: remove unreachable code

`path` can never be NULL in this code path; it is unnecessary to check
it.

There may be a null pointer dereference, or else the comparison
against null is unnecessary.

In lttng_trace_chunk_rename_path_no_lock: All paths that lead to this
null pointer comparison already dereference the pointer
earlier (CWE-476).

Reported-by: Coverity Scan
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I4d850b0b8686300268d85f577ae5f14a96d66348
---

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 63bfb6c52..6039f6376 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -911,15 +911,11 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
 	}
 
 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;