X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=327612ce283b1db9e00de1ea6bf8ec2fb81fb77d;hp=75d1738d9ee2f4c38e0137f9e6779b4ec350943d;hb=9bc1a4b4f0dc0dab6be2ea56d0cbdf4d703865f5;hpb=420acd9041f0b99feeb0e18828077738d3cb2401

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 75d1738d9..327612ce2 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -966,8 +966,8 @@ enum lttng_trace_chunk_status lttng_trace_chunk_get_credentials(
 	pthread_mutex_lock(&chunk->lock);
 	if (chunk->credentials.is_set) {
 		if (chunk->credentials.value.use_current_user) {
-			credentials->uid = geteuid();
-			credentials->gid = getegid();
+			LTTNG_OPTIONAL_SET(&credentials->uid, geteuid());
+			LTTNG_OPTIONAL_SET(&credentials->gid, getegid());
 		} else {
 			*credentials = chunk->credentials.value.user;
 		}
@@ -1077,9 +1077,8 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_as_owner(
 		 * A nameless chunk does not need its own output directory.
 		 * The session's output directory will be used.
 		 */
-		const bool reference_acquired =
-				lttng_directory_handle_get(
-					session_output_directory);
+		reference_acquired = lttng_directory_handle_get(
+				session_output_directory);
 
 		assert(reference_acquired);
 		chunk_directory_handle = session_output_directory;
@@ -1834,7 +1833,12 @@ bool lttng_trace_chunk_ids_equal(const struct lttng_trace_chunk *chunk_a,
 {
 	bool equal = false;
 
-	if (!chunk_a || !chunk_b) {
+	if (chunk_a == chunk_b) {
+		equal = true;
+		goto end;
+	}
+
+	if (!!chunk_a ^ !!chunk_b) {
 		goto end;
 	}