X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=plugins%2Futils%2Fmuxer%2Fmuxer.c;h=47d790b3d9a14e59387e7d611c984077680d608e;hp=ae08d0d719f5845266ceb28734e1b081178efde7;hb=6c20f4a0c496cfac67ceabe876edc796929ffb64;hpb=a1d04c7392981c19cf904b4e9dda3714d0afe0be

diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c
index ae08d0d7..47d790b3 100644
--- a/plugins/utils/muxer/muxer.c
+++ b/plugins/utils/muxer/muxer.c
@@ -147,7 +147,7 @@ struct muxer_upstream_msg_iter *muxer_msg_iter_add_upstream_msg_iter(
 
 	if (!muxer_upstream_msg_iter) {
 		BT_LOGE_STR("Failed to allocate one muxer's upstream message iterator wrapper.");
-		goto end;
+		goto error;
 	}
 
 	muxer_upstream_msg_iter->msg_iter = self_msg_iter;
@@ -155,7 +155,7 @@ struct muxer_upstream_msg_iter *muxer_msg_iter_add_upstream_msg_iter(
 	muxer_upstream_msg_iter->msgs = g_queue_new();
 	if (!muxer_upstream_msg_iter->msgs) {
 		BT_LOGE_STR("Failed to allocate a GQueue.");
-		goto end;
+		goto error;
 	}
 
 	g_ptr_array_add(muxer_msg_iter->active_muxer_upstream_msg_iters,
@@ -165,6 +165,12 @@ struct muxer_upstream_msg_iter *muxer_msg_iter_add_upstream_msg_iter(
 		muxer_upstream_msg_iter, muxer_msg_iter,
 		self_msg_iter);
 
+	goto end;
+
+error:
+	g_free(muxer_upstream_msg_iter);
+	muxer_upstream_msg_iter = NULL;
+
 end:
 	return muxer_upstream_msg_iter;
 }