From: David Goulet <dgoulet@efficios.com>
Date: Tue, 23 Apr 2013 17:14:19 +0000 (-0400)
Subject: Fix: remove double consumer_del_stream in error path
X-Git-Tag: v2.1.2~2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9d45202ee7516e642a7d57bbfa3361fce1afbff9;p=lttng-tools.git

Fix: remove double consumer_del_stream in error path

During a recv_stream call, an error path could have try to delete a
stream two times and could ultimately have triggererd a double free and
refcount issues on the channel.

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 5dbd6ba4b..9f8708338 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -589,7 +589,6 @@ int lttng_ustconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
 
 	ret = lttng_ustconsumer_add_stream(stream);
 	if (ret) {
-		consumer_del_stream(stream, NULL);
 		ret = -1;
 		goto error;
 	}