]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
tools lib traceevent: Free field if an error occurs on process_flags/symbols
authorNamhyung Kim <namhyung.kim@lge.com>
Wed, 19 Sep 2012 06:58:44 +0000 (15:58 +0900)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 24 Sep 2012 15:03:18 +0000 (12:03 -0300)
The field should be freed on error paths.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1348037924-17568-5-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/lib/traceevent/event-parse.c

index a776ed5cd2b487ffbbb0148667e84ef55501a273..acf40381b48b029072649deef30a3c05dd5da9a8 100644 (file)
@@ -2247,7 +2247,7 @@ process_flags(struct event_format *event, struct print_arg *arg, char **tok)
                type = process_op(event, field, &token);
 
        if (test_type_token(type, token, EVENT_DELIM, ","))
-               goto out_free;
+               goto out_free_field;
        free_token(token);
 
        arg->flags.field = field;
@@ -2269,7 +2269,9 @@ process_flags(struct event_format *event, struct print_arg *arg, char **tok)
        type = read_token_item(tok);
        return type;
 
- out_free:
+out_free_field:
+       free_arg(field);
+out_free:
        free_token(token);
        *tok = NULL;
        return EVENT_ERROR;
@@ -2289,7 +2291,7 @@ process_symbols(struct event_format *event, struct print_arg *arg, char **tok)
 
        type = process_arg(event, field, &token);
        if (test_type_token(type, token, EVENT_DELIM, ","))
-               goto out_free;
+               goto out_free_field;
 
        arg->symbol.field = field;
 
@@ -2301,7 +2303,9 @@ process_symbols(struct event_format *event, struct print_arg *arg, char **tok)
        type = read_token_item(tok);
        return type;
 
- out_free:
+out_free_field:
+       free_arg(field);
+out_free:
        free_token(token);
        *tok = NULL;
        return EVENT_ERROR;