From: Julien Desfossez <jdesfossez@efficios.com>
Date: Fri, 20 Jan 2017 21:08:58 +0000 (-0500)
Subject: Fix writer: missing put ref to values and types
X-Git-Tag: v2.0.0-pre1~417
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=d00b90bff69bfea0b81e73c166f68ca9231636d4;hp=01972692e6deb0bfe140c5ebbf60740f544b27ae

Fix writer: missing put ref to values and types

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

diff --git a/plugins/writer/write.c b/plugins/writer/write.c
index 84fe77d4..970eaea0 100644
--- a/plugins/writer/write.c
+++ b/plugins/writer/write.c
@@ -237,6 +237,7 @@ struct bt_ctf_event_class *copy_event_class(FILE *err, struct bt_ctf_event_class
 
 		ret = bt_ctf_event_class_set_attribute(writer_event_class,
 				attr_name, attr_value);
+		bt_put(attr_value);
 		if (ret < 0) {
 			fprintf(err, "[error] %s in %s:%d\n", __func__,
 					__FILE__, __LINE__);
@@ -247,6 +248,7 @@ struct bt_ctf_event_class *copy_event_class(FILE *err, struct bt_ctf_event_class
 
 	context = bt_ctf_event_class_get_context_type(event_class);
 	ret = bt_ctf_event_class_set_context_type(writer_event_class, context);
+	bt_put(context);
 	if (ret < 0) {
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
 				__LINE__);
@@ -388,6 +390,7 @@ enum bt_component_status copy_stream_class(FILE *err,
 
 	ret_int = bt_ctf_stream_class_set_packet_context_type(
 			writer_stream_class, type);
+	bt_put(type);
 	if (ret_int < 0) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
@@ -405,6 +408,7 @@ enum bt_component_status copy_stream_class(FILE *err,
 
 	ret_int = bt_ctf_stream_class_set_event_header_type(
 			writer_stream_class, type);
+	bt_put(type);
 	if (ret_int < 0) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
@@ -413,8 +417,15 @@ enum bt_component_status copy_stream_class(FILE *err,
 	}
 
 	type = bt_ctf_stream_class_get_event_context_type(stream_class);
+	if (!type) {
+		ret = BT_COMPONENT_STATUS_ERROR;
+		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+				__LINE__);
+		goto end_put_trace;
+	}
 	ret_int = bt_ctf_stream_class_set_event_context_type(
 			writer_stream_class, type);
+	bt_put(type);
 	if (ret_int < 0) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
@@ -476,6 +487,7 @@ enum bt_component_status copy_trace(FILE *err, struct bt_ctf_writer *ctf_writer,
 
 		ret_int = bt_ctf_trace_set_environment_field(writer_trace,
 				name, value);
+		bt_put(value);
 		if (ret_int < 0) {
 			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
 					__LINE__);
diff --git a/plugins/writer/writer.c b/plugins/writer/writer.c
index 8f1d2fc1..f89ac746 100644
--- a/plugins/writer/writer.c
+++ b/plugins/writer/writer.c
@@ -272,6 +272,7 @@ enum bt_component_status writer_component_init(
 		ret = BT_COMPONENT_STATUS_INVALID;
 		goto error;
 	}
+	bt_put(value);
 
 	writer_component->base_path = g_string_new(path);
 	if (!writer_component) {