[PATCH 01/11] parse-events: Free flag/sym field on failure path

From: Namhyung Kim
Date: Mon Apr 23 2012 - 01:00:14 EST


If parsing flag/sym field failed after allocating it, it
should be freed.

Signed-off-by: Namhyung Kim <namhyung.kim@xxxxxxx>
---
parse-events.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/parse-events.c b/parse-events.c
index bd078ba..81e6581 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -2166,10 +2166,10 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **

value = arg_eval(arg);
if (value == NULL)
- goto out_free;
+ goto out_free_field;
field->value = strdup(value);
if (field->value == NULL)
- goto out_free;
+ goto out_free_field;

free_arg(arg);
arg = alloc_arg();
@@ -2177,14 +2177,14 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
free_token(token);
type = process_arg(event, arg, &token);
if (test_type_token(type, token, EVENT_OP, "}"))
- goto out_free;
+ goto out_free_field_value;

value = arg_eval(arg);
if (value == NULL)
- goto out_free;
+ goto out_free_field_value;
field->str = strdup(value);
if (field->str == NULL)
- goto out_free;
+ goto out_free_field_value;
free_arg(arg);
arg = NULL;

@@ -2198,6 +2198,10 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
*tok = token;
return type;

+out_free_field_value:
+ free(field->value);
+out_free_field:
+ free(field);
out_free:
free_arg(arg);
free_token(token);
--
1.7.10

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/