From mboxrd@z Thu Jan  1 00:00:00 1970
From: dgoulet@efficios.com (David Goulet)
Date: Tue, 4 Feb 2014 14:14:09 -0500
Subject: [lttng-dev] [PATCH lttng-tools] Fix: memory leak when UST
 events are enabled with exclusions
In-Reply-To: <1390240272-16029-1-git-send-email-jeremie.galarneau@efficios.com>
References: <1390240272-16029-1-git-send-email-jeremie.galarneau@efficios.com>
Message-ID: <20140204191409.GG13440@thessa>

Merged!

On 20 Jan (12:51:12), J?r?mie Galarneau wrote:
> Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
> ---
>  src/bin/lttng-sessiond/trace-ust.c | 1 +
>  src/bin/lttng-sessiond/trace-ust.h | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
> index 70b3a91..c08246a 100644
> --- a/src/bin/lttng-sessiond/trace-ust.c
> +++ b/src/bin/lttng-sessiond/trace-ust.c
> @@ -504,6 +504,7 @@ void trace_ust_destroy_event(struct ltt_ust_event *event)
>  
>  	DBG2("Trace destroy UST event %s", event->attr.name);
>  	free(event->filter);
> +	free(event->exclusion);
>  	free(event);
>  }
>  
> diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
> index f2f8c7e..07af0f1 100644
> --- a/src/bin/lttng-sessiond/trace-ust.h
> +++ b/src/bin/lttng-sessiond/trace-ust.h
> @@ -50,7 +50,7 @@ struct ltt_ust_event {
>  	struct lttng_ust_event attr;
>  	struct lttng_ht_node_str node;
>  	struct lttng_ust_filter_bytecode *filter;
> -	const struct lttng_event_exclusion *exclusion;
> +	struct lttng_event_exclusion *exclusion;
>  };
>  
>  /* UST channel */
> -- 
> 1.8.5.2
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 603 bytes
Desc: Digital signature
URL: <http://lists.lttng.org/pipermail/lttng-dev/attachments/20140204/a48a5a2e/attachment.pgp>