X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=8f9d214607bf02093a008fb7a67715ba6dc8612f;hb=704161d2b5914bbebbc9d93028cf4bcf12096139;hp=f6d78a66252f576eac043424dab48f21c737a5a6;hpb=66f9eb4e8ff51f0ca0f499a49371a7002a76aa09;p=lttng-tools.git

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index f6d78a662..8f9d21460 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -254,8 +254,16 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
 	/* Compat with relayd 2.1 */
 	if (rsock->minor == 1) {
 		memset(&msg, 0, sizeof(msg));
-		strncpy(msg.channel_name, channel_name, sizeof(msg.channel_name));
-		strncpy(msg.pathname, pathname, sizeof(msg.pathname));
+		if (lttng_strncpy(msg.channel_name, channel_name,
+				sizeof(msg.channel_name))) {
+			ret = -1;
+			goto error;
+		}
+		if (lttng_strncpy(msg.pathname, pathname,
+				sizeof(msg.pathname))) {
+			ret = -1;
+			goto error;
+		}
 
 		/* Send command */
 		ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0);
@@ -265,8 +273,16 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
 	} else {
 		memset(&msg_2_2, 0, sizeof(msg_2_2));
 		/* Compat with relayd 2.2+ */
-		strncpy(msg_2_2.channel_name, channel_name, sizeof(msg_2_2.channel_name));
-		strncpy(msg_2_2.pathname, pathname, sizeof(msg_2_2.pathname));
+		if (lttng_strncpy(msg_2_2.channel_name, channel_name,
+				sizeof(msg_2_2.channel_name))) {
+			ret = -1;
+			goto error;
+		}
+		if (lttng_strncpy(msg_2_2.pathname, pathname,
+				sizeof(msg_2_2.pathname))) {
+			ret = -1;
+			goto error;
+		}
 		msg_2_2.tracefile_size = htobe64(tracefile_size);
 		msg_2_2.tracefile_count = htobe64(tracefile_count);