GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools lib traceevent: Free field if an error occurs on process_fields

Browse source 
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>
This commit is contained in:
Namhyung Kim 2012-09-19 15:58:43 +09:00 • committed by Arnaldo Carvalho de Melo
parent 41e51a289b
commit f8c49d2645
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tools/lib/traceevent/event-parse.c
View file

@ -2186,10 +2186,10 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
value = arg_eval(arg); value = arg_eval(arg);
if (value == NULL) if (value == NULL)
goto out_free; goto out_free_field;
field->value = strdup(value); field->value = strdup(value);
if (field->value == NULL) if (field->value == NULL)
goto out_free; goto out_free_field;
free_arg(arg); free_arg(arg);
arg = alloc_arg(); arg = alloc_arg();
@ -2197,14 +2197,14 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
free_token(token); free_token(token);
type = process_arg(event, arg, &token); type = process_arg(event, arg, &token);
if (test_type_token(type, token, EVENT_OP, "}")) if (test_type_token(type, token, EVENT_OP, "}"))
goto out_free; goto out_free_field;
value = arg_eval(arg); value = arg_eval(arg);
if (value == NULL) if (value == NULL)
goto out_free; goto out_free_field;
field->str = strdup(value); field->str = strdup(value);
if (field->str == NULL) if (field->str == NULL)
goto out_free; goto out_free_field;
free_arg(arg); free_arg(arg);
arg = NULL; arg = NULL;
@ -2218,6 +2218,8 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
*tok = token; *tok = token;
return type; return type;
out_free_field:
free_flag_sym(field);
out_free: out_free:
free_arg(arg); free_arg(arg);
free_token(token); free_token(token);