Fix: sessiond: fix memory leak in receive_lttng_trigger

[lttng-tools.git] / src / bin / lttng-sessiond / trace-kernel.c

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index a453fd8b705537ba8908e729517c20b408ef2951..dc15829ba5c6488424327404922c665f4bc08f4f 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -485,6 +485,7 @@ error:
 enum lttng_error_code trace_kernel_create_event_notifier_rule(
                struct lttng_trigger *trigger,
                uint64_t token,
+               uint64_t error_counter_index,
                struct ltt_kernel_event_notifier_rule **event_notifier_rule)
 {
        enum lttng_error_code ret = LTTNG_OK;
@@ -522,6 +523,7 @@ enum lttng_error_code trace_kernel_create_event_notifier_rule(
        local_kernel_token_event_rule->fd = -1;
        local_kernel_token_event_rule->enabled = 1;
        local_kernel_token_event_rule->token = token;
+       local_kernel_token_event_rule->error_counter_index = error_counter_index;
 
        /* Get the reference of the event rule. */
        lttng_trigger_get(trigger);
@@ -944,11 +946,11 @@ void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel)
        /* Remove from channel list */
        cds_list_del(&channel->list);
 
-       if (notification_thread_handle
-                       && channel->published_to_notification_thread) {
+       if (the_notification_thread_handle &&
+                       channel->published_to_notification_thread) {
                status = notification_thread_command_remove_channel(
-                               notification_thread_handle,
-                               channel->key, LTTNG_DOMAIN_KERNEL);
+                               the_notification_thread_handle, channel->key,
+                               LTTNG_DOMAIN_KERNEL);
                assert(status == LTTNG_OK);
        }
        free(channel->channel->attr.extended.ptr);