X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=e2096eccd3897b5a500ebaabbe8ea5ecfac1cd90;hp=f87e4baf0846ad9b666ac78ceb98cec6b4635247;hb=862d3a3b75a25b29eb589fb9b3efc7e19d1c1bec;hpb=bfc3fb17b18dffde4b19c51c002d0112eca06f70

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index f87e4baf0..e2096eccd 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -230,10 +230,21 @@ ssize_t send_viewer_streams(struct lttcomm_sock *sock,
 		send_stream.ctf_trace_id = htobe64(ctf_trace->id);
 		send_stream.metadata_flag = htobe32(
 				vstream->stream->is_metadata);
-		strncpy(send_stream.path_name, vstream->path_name,
-				sizeof(send_stream.path_name));
-		strncpy(send_stream.channel_name, vstream->channel_name,
-				sizeof(send_stream.channel_name));
+		if (lttng_strncpy(send_stream.path_name, vstream->path_name,
+				sizeof(send_stream.path_name))) {
+			pthread_mutex_unlock(&vstream->stream->lock);
+			viewer_stream_put(vstream);
+			ret = -1;	/* Error. */
+			goto end_unlock;
+		}
+		if (lttng_strncpy(send_stream.channel_name,
+				vstream->channel_name,
+				sizeof(send_stream.channel_name))) {
+			pthread_mutex_unlock(&vstream->stream->lock);
+			viewer_stream_put(vstream);
+			ret = -1;	/* Error. */
+			goto end_unlock;
+		}
 
 		DBG("Sending stream %" PRIu64 " to viewer",
 				vstream->stream->stream_handle);
@@ -328,7 +339,10 @@ int make_viewer_streams(struct relay_session *session,
 				 * Ensure a self-reference is preserved even
 				 * after we have put our local reference.
 				 */
-				viewer_stream_get(vstream);
+				if (!viewer_stream_get(vstream)) {
+					ERR("Unable to get self-reference on viewer stream, logic error.");
+					abort();
+				}
 			} else {
 				if (!vstream->sent_flag && nb_unsent) {
 					/* Update number of unsent stream counter. */
@@ -794,7 +808,7 @@ end:
 static
 int viewer_list_sessions(struct relay_connection *conn)
 {
-	int ret;
+	int ret = 0;
 	struct lttng_viewer_list_sessions session_list;
 	struct lttng_ht_iter iter;
 	struct relay_session *session;
@@ -824,8 +838,7 @@ int viewer_list_sessions(struct relay_connection *conn)
 				new_buf_count * sizeof(*send_session_buf));
 			if (!newbuf) {
 				ret = -1;
-				rcu_read_unlock();
-				goto end_free;
+				break;
 			}
 			send_session_buf = newbuf;
 			buf_count = new_buf_count;
@@ -835,14 +848,12 @@ int viewer_list_sessions(struct relay_connection *conn)
 				session->session_name,
 				sizeof(send_session->session_name))) {
 			ret = -1;
-			rcu_read_unlock();
-			goto end_free;
+			break;
 		}
 		if (lttng_strncpy(send_session->hostname, session->hostname,
 				sizeof(send_session->hostname))) {
 			ret = -1;
-			rcu_read_unlock();
-			goto end_free;
+			break;
 		}
 		send_session->id = htobe64(session->id);
 		send_session->live_timer = htobe32(session->live_timer);
@@ -855,6 +866,9 @@ int viewer_list_sessions(struct relay_connection *conn)
 		count++;
 	}
 	rcu_read_unlock();
+	if (ret < 0) {
+		goto end_free;
+	}
 
 	session_list.sessions_count = htobe32(count);