From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Fri, 5 May 2017 20:46:41 +0000 (-0400)
Subject: ctf.fs source: metadata: fix error paths
X-Git-Tag: v2.0.0-pre1~308
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=8318bbaae63a9b00bcc3d9bf66a6d73ecd34f7ed;p=babeltrace.git

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 81d6ddef..a36a0860 100644
--- 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 cd211961..13cc816e 100644
--- 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;
 	}