From: David Goulet <dgoulet@efficios.com>
Date: Fri, 14 Jun 2013 17:35:27 +0000 (-0400)
Subject: Fix: add missing free causing a memleak
X-Git-Tag: v2.2.0-rc3~23
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3295105b7e92bbfa6a21dc9c5d71ad5458540ac9;p=lttng-tools.git

Fix: add missing free causing a memleak

Also remove a unused variable in the ust registry event structure.

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

diff --git a/src/bin/lttng-sessiond/ust-registry.c b/src/bin/lttng-sessiond/ust-registry.c
index 6e9f0699b..682da2b48 100644
--- a/src/bin/lttng-sessiond/ust-registry.c
+++ b/src/bin/lttng-sessiond/ust-registry.c
@@ -324,6 +324,7 @@ void destroy_channel_rcu(struct rcu_head *head)
 	if (chan->ht) {
 		ht_cleanup_push(chan->ht);
 	}
+	free(chan->ctx_fields);
 	free(chan);
 }
 
diff --git a/src/bin/lttng-sessiond/ust-registry.h b/src/bin/lttng-sessiond/ust-registry.h
index 3c46984a3..a82aeb208 100644
--- a/src/bin/lttng-sessiond/ust-registry.h
+++ b/src/bin/lttng-sessiond/ust-registry.h
@@ -127,7 +127,6 @@ struct ust_registry_event {
 	size_t nr_fields;
 	struct ustctl_field *fields;
 	char *model_emf_uri;
-	struct lttng_ust_object_data *obj;
 	/*
 	 * Flag for this channel if the metadata was dumped once during
 	 * registration. 0 means no, 1 yes.