Tests: abort test on memory allocation failure

[lttng-tools.git] / tests / unit / test_ust_data.c

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index 29bb58f4844c4e6cda279f9c847facc9e236ca45..4d1762f5453086acf5e83e9cc93dcca2cd8bf1e3 100644 (file)
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -38,7 +38,7 @@
 #define RANDOM_STRING_LEN      11
 
 /* Number of TAP tests in this file */
-#define NUM_TESTS 12
+#define NUM_TESTS 16
 
 /* For error.h */
 int lttng_opt_quiet = 1;
@@ -101,8 +101,8 @@ static void test_create_ust_channel(void)
 
        memset(&attr, 0, sizeof(attr));
 
-       strncpy(attr.name, "channel0", 8);
-
+       ok(lttng_strncpy(attr.name, "channel0", sizeof(attr.name)) == 0,
+               "Validate channel name length");
        uchan = trace_ust_create_channel(&attr, LTTNG_DOMAIN_UST);
        ok(uchan != NULL, "Create UST channel");
 
@@ -123,7 +123,9 @@ static void test_create_ust_event(void)
        struct lttng_event ev;
 
        memset(&ev, 0, sizeof(ev));
-       strncpy(ev.name, get_random_string(), LTTNG_SYMBOL_NAME_LEN);
+       ok(lttng_strncpy(ev.name, get_random_string(),
+                       LTTNG_SYMBOL_NAME_LEN) == 0,
+               "Validate string length");
        ev.type = LTTNG_EVENT_TRACEPOINT;
        ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
@@ -154,7 +156,8 @@ static void test_create_ust_event_exclusion(void)
        /* make a wildcarded event name */
        name = get_random_string();
        name[strlen(name) - 1] = '*';
-       strncpy(ev.name, name, LTTNG_SYMBOL_NAME_LEN);
+       ok(lttng_strncpy(ev.name, name, LTTNG_SYMBOL_NAME_LEN) == 0,
+               "Validate string length");
 
        ev.type = LTTNG_EVENT_TRACEPOINT;
        ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
@@ -162,12 +165,12 @@ static void test_create_ust_event_exclusion(void)
        /* set up an exclusion set */
        exclusion = zmalloc(sizeof(*exclusion) +
                LTTNG_SYMBOL_NAME_LEN * exclusion_count);
+       ok(exclusion != NULL, "Create UST exclusion");
        if (!exclusion) {
                PERROR("zmalloc");
+               return;
        }
 
-       ok(exclusion != NULL, "Create UST exclusion");
-
        exclusion->count = exclusion_count;
        random_name = get_random_string();
        strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0), random_name,
@@ -176,13 +179,16 @@ static void test_create_ust_event_exclusion(void)
                LTTNG_SYMBOL_NAME_LEN);
 
        event = trace_ust_create_event(&ev, NULL, NULL, exclusion, false);
+       exclusion = NULL;
 
        ok(!event, "Create UST event with identical exclusion names fails");
 
        exclusion = zmalloc(sizeof(*exclusion) +
                LTTNG_SYMBOL_NAME_LEN * exclusion_count);
+       ok(exclusion != NULL, "Create UST exclusion");
        if (!exclusion) {
                PERROR("zmalloc");
+               return;
        }
 
        exclusion->count = exclusion_count;