Fix: ctf-writer: stream-class.c: Dereference after null check

[babeltrace.git] / src / ctf-writer / writer.c

diff --git a/src/ctf-writer/writer.c b/src/ctf-writer/writer.c
index 6c72acaf5f808928326e4468d1dbebaf3376878c..1738b70c6df1b6b44b41d438edbe17cde253d9f2 100644 (file)
--- a/src/ctf-writer/writer.c
+++ b/src/ctf-writer/writer.c
@@ -37,12 +37,12 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <babeltrace2/ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/object.h>
 
 #include "common/assert.h"
 #include "compat/compiler.h"
 #include "compat/endian.h"
-#include "compat/uuid.h"
+#include "common/uuid.h"
 
 #include "clock.h"
 #include "fields.h"
@@ -109,7 +109,7 @@ struct bt_ctf_writer *bt_ctf_writer_create(const char *path)
 {
        int ret;
        struct bt_ctf_writer *writer = NULL;
-       unsigned char uuid[16];
+       bt_uuid_t uuid;
        char *metadata_path = NULL;
 
        if (!path) {
@@ -140,11 +140,7 @@ struct bt_ctf_writer *bt_ctf_writer_create(const char *path)
        }
 
        /* Generate a UUID for this writer's trace */
-       ret = bt_uuid_generate(uuid);
-       if (ret) {
-               BT_LOGE_STR("Cannot generate UUID for CTF writer's trace.");
-               goto error_destroy;
-       }
+       bt_uuid_generate(uuid);
 
        ret = bt_ctf_trace_set_uuid(writer->trace, uuid);
        if (ret) {
@@ -221,7 +217,7 @@ struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
 {
        struct bt_ctf_stream *stream = NULL;
        int stream_class_count;
-       bt_bool stream_class_found = BT_FALSE;
+       bt_ctf_bool stream_class_found = BT_CTF_FALSE;
        int i;
 
        if (!writer || !stream_class) {
@@ -240,7 +236,7 @@ struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
                                writer->trace, i);
 
                if (existing_stream_class == stream_class) {
-                       stream_class_found = BT_TRUE;
+                       stream_class_found = BT_CTF_TRUE;
                }
 
                BT_CTF_OBJECT_PUT_REF_AND_RESET(existing_stream_class);