X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.cpp;h=cdd9cbd66dd033a3e6b60486562a6107a6722c4f;hb=1f38e81c6b96ff42cce9b4c2d30e33cd9e82a99e;hp=04aa8c83eb994c7dc7c7fc29ddec466391047705;hpb=f46376a14da2eb796690cb4e718e8b213839d6ea;p=lttng-tools.git

diff --git a/tests/unit/test_ust_data.cpp b/tests/unit/test_ust_data.cpp
index 04aa8c83e..cdd9cbd66 100644
--- a/tests/unit/test_ust_data.cpp
+++ b/tests/unit/test_ust_data.cpp
@@ -13,12 +13,12 @@
 #include <urcu.h>
 
 #include <lttng/lttng.h>
-#include <bin/lttng-sessiond/lttng-ust-abi.h>
-#include <common/defaults.h>
-#include <common/compat/errno.h>
-#include <bin/lttng-sessiond/trace-ust.h>
-#include <bin/lttng-sessiond/ust-app.h>
-#include <bin/lttng-sessiond/notification-thread.h>
+#include <bin/lttng-sessiond/lttng-ust-abi.hpp>
+#include <common/defaults.hpp>
+#include <common/compat/errno.hpp>
+#include <bin/lttng-sessiond/trace-ust.hpp>
+#include <bin/lttng-sessiond/ust-app.hpp>
+#include <bin/lttng-sessiond/notification-thread.hpp>
 
 #include <lttng/ust-sigbus.h>
 
@@ -77,6 +77,7 @@ static void test_create_one_ust_session(void)
 	   "Validate UST session");
 
 	trace_ust_destroy_session(usess);
+	trace_ust_free_session(usess);
 }
 
 static void test_create_ust_channel(void)
@@ -143,6 +144,7 @@ static void test_create_ust_event(void)
 
 static void test_create_ust_event_exclusion(void)
 {
+	int copy_ret;
 	enum lttng_error_code ret;
 	struct ltt_ust_event *event;
 	struct lttng_event ev;
@@ -164,7 +166,7 @@ static void test_create_ust_event_exclusion(void)
 	ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
 	/* set up an exclusion set */
-	exclusion = (lttng_event_exclusion *) zmalloc(sizeof(*exclusion) +
+	exclusion = zmalloc<lttng_event_exclusion>(sizeof(*exclusion) +
 		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
 	ok(exclusion != NULL, "Create UST exclusion");
 	if (!exclusion) {
@@ -184,7 +186,7 @@ static void test_create_ust_event_exclusion(void)
 
 	ok(ret != LTTNG_OK, "Create UST event with identical exclusion names fails");
 
-	exclusion = (lttng_event_exclusion *) zmalloc(sizeof(*exclusion) +
+	exclusion = zmalloc<lttng_event_exclusion>(sizeof(*exclusion) +
 		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
 	ok(exclusion != NULL, "Create UST exclusion");
 	if (!exclusion) {
@@ -192,7 +194,7 @@ static void test_create_ust_event_exclusion(void)
 		goto end;
 	}
 
-	exclusion_copy = (lttng_event_exclusion *) zmalloc(sizeof(*exclusion) +
+	exclusion_copy = zmalloc<lttng_event_exclusion>(sizeof(*exclusion) +
 		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
 	if (!exclusion_copy) {
 		skip(2, "zmalloc failed");
@@ -206,16 +208,24 @@ static void test_create_ust_event_exclusion(void)
 	 */
 
 	exclusion->count = exclusion_count;
-	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
-		get_random_string(), LTTNG_SYMBOL_NAME_LEN - 1);
-	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1),
-		get_random_string(), LTTNG_SYMBOL_NAME_LEN - 1);
+	copy_ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
+			get_random_string(),
+			sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0)));
+	LTTNG_ASSERT(copy_ret == 0);
+	copy_ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1),
+			get_random_string(),
+			sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1)));
+	LTTNG_ASSERT(copy_ret == 0);
 
 	exclusion_copy->count = exclusion_count;
-	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 0),
-		LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0), LTTNG_SYMBOL_NAME_LEN);
-	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 1),
-		LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1), LTTNG_SYMBOL_NAME_LEN);
+	copy_ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 0),
+			LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
+			sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 0)));
+	LTTNG_ASSERT(copy_ret == 0);
+	copy_ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 1),
+			LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1),
+			sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 1)));
+	LTTNG_ASSERT(copy_ret == 0);
 
 	ret = trace_ust_create_event(&ev, NULL, NULL, exclusion, false, &event);
 	exclusion = NULL;