Fix: possible NULL pointer dereference in CTF Writer/IR tests

[babeltrace.git] / tests / lib / test_ctf_writer.c

diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
index 9d98d627f9124d06541c3d3acc3b35cad108226b..57c64858788bca06d6525158f89fab067587d559 100644 (file)
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -566,7 +566,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
        bt_ctf_event_set_payload(simple_event, "enum_field_unsigned",
                enum_field_unsigned);
        ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field_unsigned);
-       ok(!strcmp(ret_char, mapping_name_test),
+       ok(ret_char && !strcmp(ret_char, mapping_name_test),
                "bt_ctf_field_enumeration_get_mapping_name returns the correct mapping name with an unsigned container");
 
        ok(bt_ctf_clock_set_time(clock, current_time) == 0, "Set clock time");
@@ -875,7 +875,8 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
                "bt_ctf_event_class_set_attribute cannot set \"name\" or \"model.emf.uri\" to an integer value");
        BT_OBJECT_PUT(obj);
 
-       assert(obj = bt_object_integer_create_init(5));
+       obj = bt_object_integer_create_init(5);
+       assert(obj);
        ok(!bt_ctf_event_class_set_attribute(event_class, "loglevel", obj),
                "bt_ctf_event_class_set_attribute succeeds in setting the \"loglevel\" attribute");
        BT_OBJECT_PUT(obj);
@@ -903,7 +904,8 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
        ok(ret,
                "bt_ctf_event_class_set_attribute cannot set \"id\" or \"loglevel\" to a string value");
        BT_OBJECT_PUT(obj);
-       assert(obj = bt_object_string_create_init("http://kernel.org/"));
+       obj = bt_object_string_create_init("http://kernel.org/");
+       assert(obj);
        assert(!bt_ctf_event_class_set_attribute(event_class, "model.emf.uri", obj));
        BT_OBJECT_PUT(obj);
 
@@ -1663,7 +1665,8 @@ void test_instanciate_event_before_stream(struct bt_ctf_writer *writer)
        struct bt_ctf_trace *trace = NULL;
        struct bt_ctf_clock *clock = NULL;
        struct bt_ctf_stream_class *stream_class = NULL;
-       struct bt_ctf_stream *stream = NULL;
+       struct bt_ctf_stream *stream = NULL,
+               *ret_stream = NULL;
        struct bt_ctf_event_class *event_class = NULL;
        struct bt_ctf_event *event = NULL;
        struct bt_ctf_field_type *integer_type = NULL;
@@ -1744,16 +1747,26 @@ void test_instanciate_event_before_stream(struct bt_ctf_writer *writer)
                goto end;
        }
 
+       ok(bt_ctf_event_get_stream(NULL) == NULL,
+               "bt_ctf_event_get_stream handles NULL correctly");
+       ok(bt_ctf_event_get_stream(event) == NULL,
+               "bt_ctf_event_get_stream returns NULL on event which has not yet been appended to a stream");
+
        ret = bt_ctf_stream_append_event(stream, event);
        if (ret) {
                diag("Failed to append event to stream");
                goto end;
        }
+
+       ret_stream = bt_ctf_event_get_stream(event);
+       ok(ret_stream == stream,
+               "bt_ctf_event_get_stream returns an event's stream after it has been appended");
 end:
        ok(ret == 0,
                "Create an event before instanciating its associated stream");
        bt_ctf_trace_put(trace);
        bt_ctf_stream_put(stream);
+       bt_ctf_stream_put(ret_stream);
        bt_ctf_stream_class_put(stream_class);
        bt_ctf_event_class_put(event_class);
        bt_ctf_event_put(event);
@@ -1771,7 +1784,8 @@ void append_existing_event_class(struct bt_ctf_stream_class *stream_class)
                "two event classes with the same name cannot cohabit within the same stream class");
        bt_ctf_event_class_put(event_class);
 
-       assert(event_class = bt_ctf_event_class_create("different name, ok"));
+       event_class = bt_ctf_event_class_create("different name, ok");
+       assert(event_class);
        assert(!bt_ctf_event_class_set_id(event_class, 11));
        ok(bt_ctf_stream_class_add_event_class(stream_class, event_class),
                "two event classes with the same ID cannot cohabit within the same stream class");