ctf.fs source: metadata: fix error paths

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/plugins/ctf/common/metadata/decoder.c b/plugins/ctf/common/metadata/decoder.c
index 81d6ddef7837e0127efdbd8f3a2e70223fc95941..a36a0860811af1770b684b8523615c06f75e1c44 100644 (file)
--- a/plugins/ctf/common/metadata/decoder.c
+++ b/plugins/ctf/common/metadata/decoder.c
@@ -248,6 +248,7 @@ error:
 
        if (*buf) {
                free(*buf);
+               *buf = NULL;
        }
 
 end:

diff --git a/plugins/ctf/fs-src/metadata.c b/plugins/ctf/fs-src/metadata.c
index cd2119610693401dfb76f8061613496a1a86a0c8..13cc816e124596c3b9560c4bc659decfdec1325d 100644 (file)
--- a/plugins/ctf/fs-src/metadata.c
+++ b/plugins/ctf/fs-src/metadata.c
@@ -109,6 +109,7 @@ int ctf_fs_metadata_set_trace(struct ctf_fs_component *ctf_fs)
        file = get_file(ctf_fs, ctf_fs->trace_path->str);
        if (!file) {
                PERR("Cannot create metadata file object\n");
+               ret = -1;
                goto end;
        }
 
@@ -117,6 +118,7 @@ int ctf_fs_metadata_set_trace(struct ctf_fs_component *ctf_fs)
                ctf_fs->options.clock_offset_ns);
        if (!metadata_decoder) {
                PERR("Cannot create metadata decoder object\n");
+               ret = -1;
                goto end;
        }