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 86c1e23bf43edceffa0bce237c40fb0772899a8b..f22f8c4e21fdfcf3db85e9f6a3c8aec161d9cdb3 100644 (file)
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -106,8 +106,11 @@ static void test_create_ust_channel(void)
 {
        struct ltt_ust_channel *uchan;
        struct lttng_channel attr;
+       struct lttng_channel_extended extended;
 
        memset(&attr, 0, sizeof(attr));
+       memset(&extended, 0, sizeof(extended));
+       attr.attr.extended.ptr = &extended;
 
        ok(lttng_strncpy(attr.name, "channel0", sizeof(attr.name)) == 0,
                "Validate channel name length");
@@ -249,8 +252,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);
 }