X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fchannel.cpp;h=be3b62343ec447bdb45b619a79452e55e0796772;hb=c9e313bc594f40a86eed237dce222c0fc99c957f;hp=db8d6fdec0c7130a738508c6a71f44a4b0e6bdbd;hpb=999af9c1150784f8676c6fce0764772d2314854a;p=lttng-tools.git

diff --git a/src/common/channel.cpp b/src/common/channel.cpp
index db8d6fdec..be3b62343 100644
--- a/src/common/channel.cpp
+++ b/src/common/channel.cpp
@@ -5,18 +5,16 @@
  *
  */
 
-#include <common/macros.h>
+#include <common/buffer-view.hpp>
+#include <common/dynamic-array.hpp>
+#include <common/dynamic-buffer.hpp>
+#include <common/error.hpp>
+#include <common/macros.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <lttng/channel-internal.hpp>
 #include <lttng/channel.h>
 #include <lttng/constant.h>
-#include <lttng/channel-internal.h>
-#include <lttng/userspace-probe-internal.h>
-#include <common/dynamic-buffer.h>
-#include <common/error.h>
-#include <assert.h>
-#include <string.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/dynamic-array.h>
-#include <common/buffer-view.h>
+#include <lttng/userspace-probe-internal.hpp>
 
 static enum lttng_error_code flatten_lttng_channels(
 		struct lttng_dynamic_pointer_array *channels,
@@ -146,11 +144,6 @@ ssize_t lttng_channel_create_from_buffer(const struct lttng_buffer_view *view,
 				lttng_buffer_view_from_view(view, offset,
 						channel_comm->name_len);
 
-		if (channel_comm->name_len > LTTNG_SYMBOL_NAME_LEN - 1) {
-			ret = -1;
-			goto end;
-		}
-
 		name = name_view.data;
 		if (!lttng_buffer_view_contains_string(
 				    &name_view, name, channel_comm->name_len)) {
@@ -158,7 +151,12 @@ ssize_t lttng_channel_create_from_buffer(const struct lttng_buffer_view *view,
 			goto end;
 		}
 
-		strcpy(local_channel->name, name);
+		ret = lttng_strncpy(local_channel->name, name,
+				sizeof(local_channel->name));
+		if (ret) {
+			goto end;
+		}
+
 		offset += channel_comm->name_len;
 	}
 
@@ -198,7 +196,7 @@ int lttng_channel_serialize(
 {
 	int ret;
 	size_t name_len;
-	struct lttng_channel_comm channel_comm = { 0 };
+	struct lttng_channel_comm channel_comm = {};
 	struct lttng_channel_extended *extended;
 
 	assert(channel);