Skip to content

Commit

Permalink
tools lib traceevent: Free field if an error occurs on process_fields
Browse files Browse the repository at this point in the history
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-4-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Namhyung Kim authored and Arnaldo Carvalho de Melo committed Sep 24, 2012
1 parent 41e51a2 commit f8c49d2
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions tools/lib/traceevent/event-parse.c
Original file line number Diff line number Diff line change
Expand Up @@ -2186,25 +2186,25 @@ 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();

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 = arg_eval(arg);
if (value == NULL)
goto out_free;
goto out_free_field;
field->str = strdup(value);
if (field->str == NULL)
goto out_free;
goto out_free_field;
free_arg(arg);
arg = NULL;

Expand All @@ -2218,6 +2218,8 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
*tok = token;
return type;

out_free_field:
free_flag_sym(field);
out_free:
free_arg(arg);
free_token(token);
Expand Down

0 comments on commit f8c49d2

Please sign in to comment.