Fix tests: NULL pointer dereference in ltt_ust_context unit tests

[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 2d31aa4b0d4a41f3c73ca7f13a708a0e01800400..61e2c3c6e54c558d650b7260120b1d6e8ab51eb4 100644 (file)
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -63,19 +63,6 @@ static char random_string[RANDOM_STRING_LEN];
 static struct ltt_ust_session *usess;
 static struct lttng_domain dom;
 
-/*
- * Stub to prevent an undefined reference in this test without having to link
- * the entire tree because of a cascade of dependencies. This is not used,
- * it is just there to prevent GCC from complaining.
- */
-int rotate_add_channel_pending(uint64_t key, enum lttng_domain_type domain,
-               struct ltt_session *session)
-{
-       ERR("Stub called instead of the real function");
-       abort();
-       return -1;
-}
-
 /*
  * Return random string of 10 characters.
  * Not thread-safe.
@@ -184,7 +171,7 @@ static void test_create_ust_event_exclusion(void)
        struct lttng_event ev;
        char *name;
        char *random_name;
-       struct lttng_event_exclusion *exclusion;
+       struct lttng_event_exclusion *exclusion = NULL;
        struct lttng_event_exclusion *exclusion_copy = NULL;
        const int exclusion_count = 2;
 
@@ -254,6 +241,7 @@ static void test_create_ust_event_exclusion(void)
                LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1), LTTNG_SYMBOL_NAME_LEN);
 
        ret = trace_ust_create_event(&ev, NULL, NULL, exclusion, false, &event);
+       exclusion = NULL;
        ok(ret == LTTNG_OK, "Create UST event with different exclusion names");
 
        if (!event) {
@@ -262,17 +250,18 @@ static void test_create_ust_event_exclusion(void)
        }
 
        ok(event->enabled == 0 &&
-          event->attr.instrumentation == LTTNG_UST_TRACEPOINT &&
-          strcmp(event->attr.name, ev.name) == 0 &&
-          event->exclusion != NULL &&
-          event->exclusion->count == exclusion_count &&
-          !memcmp(event->exclusion->names, exclusion_copy->names,
-               LTTNG_SYMBOL_NAME_LEN * exclusion_count) &&
-          event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0',
-          "Validate UST event and exclusion");
+               event->attr.instrumentation == LTTNG_UST_TRACEPOINT &&
+               strcmp(event->attr.name, ev.name) == 0 &&
+               event->exclusion != NULL &&
+               event->exclusion->count == exclusion_count &&
+               !memcmp(event->exclusion->names, exclusion_copy->names,
+                       LTTNG_SYMBOL_NAME_LEN * exclusion_count) &&
+               event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0',
+               "Validate UST event and exclusion");
 
        trace_ust_destroy_event(event);
 end:
+       free(exclusion);
        free(exclusion_copy);
        return;
 }
@@ -288,8 +277,12 @@ static void test_create_ust_context(void)
        uctx = trace_ust_create_context(&ectx);
        ok(uctx != NULL, "Create UST context");
 
-       ok((int) uctx->ctx.ctx == LTTNG_UST_CONTEXT_VTID,
-          "Validate UST context");
+       if (uctx) {
+               ok((int) uctx->ctx.ctx == LTTNG_UST_CONTEXT_VTID,
+                  "Validate UST context");
+       } else {
+               skip(1, "Skipping UST context validation as creation failed");
+       }
        free(uctx);
 }