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 6e9f0699b334bbeebb00957b0e9a9b0bd486ea1b..682da2b482779d2036f300623af9862337f2224b 100644 (file)
--- 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 3c46984a30f024a27df1d8d04a60d69aa4b44a03..a82aeb208295bb1af8b55a8d00da879dfd1e9ed1 100644 (file)
--- 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.