[PATCH] tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter

[PATCH] tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter

[Steven Rostedt]

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>
---
 tools/lib/traceevent/parse-filter.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index ad17855..2d907cb 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -209,7 +209,12 @@ static void free_arg(struct filter_arg *arg)
 	switch (arg->type) {
 	case FILTER_ARG_NONE:
 	case FILTER_ARG_BOOLEAN:
+		break;
+
 	case FILTER_ARG_NUM:
+	case FILTER_ARG_EXP:
+		free_arg(arg->op.left);
+		free_arg(arg->op.right);
 		break;
 
 	case FILTER_ARG_STR:
@@ -218,6 +223,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.3.4

Re: [PATCH] tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter

[Namhyung Kim]

Hi Steve,

2012-09-28 (금), 19:21 -0400, Steven Rostedt:
> 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>
> ---
>  tools/lib/traceevent/parse-filter.c |   11 +++++++++++
>  1 files changed, 11 insertions(+), 0 deletions(-)
> 
> diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
> index ad17855..2d907cb 100644
> --- a/tools/lib/traceevent/parse-filter.c
> +++ b/tools/lib/traceevent/parse-filter.c
> @@ -209,7 +209,12 @@ static void free_arg(struct filter_arg *arg)
>  	switch (arg->type) {
>  	case FILTER_ARG_NONE:
>  	case FILTER_ARG_BOOLEAN:
> +		break;
> +
>  	case FILTER_ARG_NUM:
> +	case FILTER_ARG_EXP:
> +		free_arg(arg->op.left);
> +		free_arg(arg->op.right);

Although they have same layout, wouldn't it be better using their own
fields?

	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;

Thanks,
Namhyung

Re: [PATCH] tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter

[Steven Rostedt]

On Mon, 2012-10-01 at 22:16 +0900, Namhyung Kim wrote:

> Although they have same layout, wouldn't it be better using their own
> fields?
> 
> 	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;

Yeah, I got lazy. This is probably better. I'll resend.

Thanks,

-- Steve