From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Steven Rostedt <rostedt@goodmis.org>,
Namhyung Kim <namhyung@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 07/11] tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter
Date: Wed, 17 Oct 2012 14:19:43 -0300 [thread overview]
Message-ID: <1350494387-10987-8-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1350494387-10987-1-git-send-email-acme@infradead.org>
From: Steven Rostedt <rostedt@goodmis.org>
Some of args were missed in free_args(), as well as subargs.
That is args like FILTER_ARG_NUM have left and right pointers to other
args that also need to be freed.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1349137408.22822.135.camel@gandalf.local.home
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/traceevent/parse-filter.c | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index ad17855..5ea4326 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -209,7 +209,16 @@ static void free_arg(struct filter_arg *arg)
switch (arg->type) {
case FILTER_ARG_NONE:
case FILTER_ARG_BOOLEAN:
+ break;
+
case FILTER_ARG_NUM:
+ free_arg(arg->num.left);
+ free_arg(arg->num.right);
+ break;
+
+ case FILTER_ARG_EXP:
+ free_arg(arg->exp.left);
+ free_arg(arg->exp.right);
break;
case FILTER_ARG_STR:
@@ -218,6 +227,12 @@ static void free_arg(struct filter_arg *arg)
free(arg->str.buffer);
break;
+ case FILTER_ARG_VALUE:
+ if (arg->value.type == FILTER_STRING ||
+ arg->value.type == FILTER_CHAR)
+ free(arg->value.str);
+ break;
+
case FILTER_ARG_OP:
free_arg(arg->op.left);
free_arg(arg->op.right);
--
1.7.1
next prev parent reply other threads:[~2012-10-17 17:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-17 17:19 [GIT PULL 00/11] perf/urgent fixes Arnaldo Carvalho de Melo
2012-10-17 17:19 ` [PATCH 01/11] perf tool: Precise mode requires exclude_guest Arnaldo Carvalho de Melo
2012-10-17 17:19 ` [PATCH 02/11] perf: Require exclude_guest to use PEBS - kernel side enforcement Arnaldo Carvalho de Melo
2012-10-17 17:19 ` [PATCH 03/11] perf tools: Fix segfault when using srcline sort key Arnaldo Carvalho de Melo
2012-10-17 17:19 ` [PATCH 04/11] perf tools: Remove warnings on JIT samples for " Arnaldo Carvalho de Melo
2012-10-17 17:19 ` [PATCH 05/11] perf hists browser: Fix off-by-two bug on the first column Arnaldo Carvalho de Melo
2012-10-17 17:19 ` [PATCH 06/11] lib tools traceevent: Add back pevent assignment in __pevent_parse_format() Arnaldo Carvalho de Melo
2012-10-17 17:19 ` Arnaldo Carvalho de Melo [this message]
2012-10-17 17:19 ` [PATCH 08/11] perf python: Initialize 'page_size' variable Arnaldo Carvalho de Melo
2012-10-18 1:31 ` Namhyung Kim
2012-10-18 13:58 ` Arnaldo Carvalho de Melo
2012-10-17 17:19 ` [PATCH 09/11] perf python: Link with libtraceevent Arnaldo Carvalho de Melo
2012-10-18 1:38 ` Namhyung Kim
2012-10-18 14:00 ` Arnaldo Carvalho de Melo
2012-10-18 14:38 ` Arnaldo Carvalho de Melo
2012-10-18 15:40 ` Namhyung Kim
2012-10-20 0:35 ` Ingo Molnar
2012-10-20 15:04 ` Arnaldo Carvalho de Melo
2012-10-21 13:33 ` Ingo Molnar
2012-10-17 17:19 ` [PATCH 10/11] perf tools: Fix build on sparc Arnaldo Carvalho de Melo
2012-10-18 1:39 ` Namhyung Kim
2012-10-18 2:15 ` David Miller
2012-10-17 17:19 ` [PATCH 11/11] perf hists browser: Add back callchain folding symbol Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350494387-10987-8-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=acme@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).