[tip:perf/urgent] tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter
Commit-ID: 743df75ff10630f1f2a461f0f4b51f601f53ec44
Gitweb: http://git.kernel.org/tip/743df75ff10630f1f2a461f0f4b51f601f53ec44
Author: Steven Rostedt
AuthorDate: Mon, 1 Oct 2012 20:23:28 -0400
Committer: Arnaldo Carvalho de Melo
CommitDate: Tue, 16 Oct 2012 13:07:05 -0300
tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter
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
Cc: Ingo Molnar
Cc: Namhyung Kim
Link: http://lkml.kernel.org/r/1349137408.22822.135.ca...@gandalf.local.home
Signed-off-by: Arnaldo Carvalho de Melo
---
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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[tip:perf/urgent] tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter
Commit-ID: 743df75ff10630f1f2a461f0f4b51f601f53ec44
Gitweb: http://git.kernel.org/tip/743df75ff10630f1f2a461f0f4b51f601f53ec44
Author: Steven Rostedt rost...@goodmis.org
AuthorDate: Mon, 1 Oct 2012 20:23:28 -0400
Committer: Arnaldo Carvalho de Melo a...@redhat.com
CommitDate: Tue, 16 Oct 2012 13:07:05 -0300
tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter
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 rost...@goodmis.org
Cc: Ingo Molnar mi...@kernel.org
Cc: Namhyung Kim namhy...@kernel.org
Link: http://lkml.kernel.org/r/1349137408.22822.135.ca...@gandalf.local.home
Signed-off-by: Arnaldo Carvalho de Melo a...@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);
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
