From: Julien Desfossez <jdesfossez@efficios.com>
Date: Fri, 9 Jun 2017 20:24:36 +0000 (-0400)
Subject: Fix: remove listener check
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=ec273a889c7b3ee1dd41dcab0a3663cf64bd0dcd;p=deliverable%2Fbabeltrace.git

Fix: remove listener check

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/plugins/ctf/fs-sink/write.c b/plugins/ctf/fs-sink/write.c
index fa789ff04..a3cc5c8bb 100644
--- a/plugins/ctf/fs-sink/write.c
+++ b/plugins/ctf/fs-sink/write.c
@@ -504,7 +504,7 @@ BT_HIDDEN
 void writer_close(struct writer_component *writer_component,
 		struct fs_writer *fs_writer)
 {
-	if (fs_writer->static_listener_id > 0) {
+	if (fs_writer->static_listener_id >= 0) {
 		bt_ctf_trace_remove_is_static_listener(fs_writer->trace,
 				fs_writer->static_listener_id);
 	}
diff --git a/plugins/lttng-utils/copy.c b/plugins/lttng-utils/copy.c
index 3ac0da0f2..9fddc8a73 100644
--- a/plugins/lttng-utils/copy.c
+++ b/plugins/lttng-utils/copy.c
@@ -567,11 +567,13 @@ enum debug_info_stream_state *insert_new_stream_state(
 	if (!v) {
 		fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
 				__FILE__, __LINE__);
+		goto end;
 	}
 	*v = DEBUG_INFO_UNKNOWN_STREAM;
 
 	g_hash_table_insert(di_trace->stream_states, stream, v);
 
+end:
 	return v;
 }
 
@@ -596,7 +598,7 @@ BT_HIDDEN
 void debug_info_close_trace(struct debug_info_iterator *debug_it,
 		struct debug_info_trace *di_trace)
 {
-	if (di_trace->static_listener_id > 0) {
+	if (di_trace->static_listener_id >= 0) {
 		bt_ctf_trace_remove_is_static_listener(di_trace->trace,
 				di_trace->static_listener_id);
 	}
@@ -1507,6 +1509,11 @@ struct bt_ctf_stream *debug_info_stream_begin(
 		}
 		state = insert_new_stream_state(debug_it, di_trace,
 				stream);
+		if (!state) {
+			fprintf(debug_it->err, "[error] Adding a new stream "
+					"on a static trace\n");
+			goto error;
+		}
 	}
 	if (*state != DEBUG_INFO_UNKNOWN_STREAM) {
 		fprintf(debug_it->err, "[error] Unexpected stream state %d\n",