X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fviewer-session.c;h=b2aba61bc73f63571381a361fd6b711284ce1afb;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=0b77fd144c6a58e407edc7118a450eb8a6cf7848;hpb=ad8bec244fdbb0e7705fd1865ae71f36f06d2b94;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/viewer-session.c b/src/bin/lttng-relayd/viewer-session.c
index 0b77fd144..b2aba61bc 100644
--- a/src/bin/lttng-relayd/viewer-session.c
+++ b/src/bin/lttng-relayd/viewer-session.c
@@ -37,11 +37,14 @@ int viewer_session_set_trace_chunk_copy(struct relay_viewer_session *vsession,
 	int ret = 0;
 	struct lttng_trace_chunk *viewer_chunk;
 
-	assert(relay_session_trace_chunk);
 	lttng_trace_chunk_put(vsession->current_trace_chunk);
 	vsession->current_trace_chunk = NULL;
 
 	DBG("Copying relay session's current trace chunk to the viewer session");
+	if (!relay_session_trace_chunk) {
+		goto end;
+	}
+
 	viewer_chunk = lttng_trace_chunk_copy(relay_session_trace_chunk);
 	if (!viewer_chunk) {
 		ERR("Failed to create a viewer trace chunk from the relay session's current chunk");
@@ -74,8 +77,7 @@ enum lttng_viewer_attach_return_code viewer_session_attach(
 	} else {
 		int ret;
 
-		assert(session->current_trace_chunk);
-		assert(!vsession->current_trace_chunk);
+		LTTNG_ASSERT(!vsession->current_trace_chunk);
 		session->viewer_attached = true;
 
 		ret = viewer_session_set_trace_chunk_copy(vsession,