UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

tools lib traceevent: Free field if an error occurs on process_flags/symbols 

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>
This commit is contained in:
Namhyung Kim 2012-09-19 15:58:44 +09:00 committed by Arnaldo Carvalho de Melo
parent f8c49d2645
commit 70d9304475
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2247,7 +2247,7 @@ process_flags(struct event_format *event, struct print_arg *arg, char **tok)
type = process_op(event, field, &token); type = process_op(event, field, &token);
if (test_type_token(type, token, EVENT_DELIM, ",")) if (test_type_token(type, token, EVENT_DELIM, ","))
goto out_free; goto out_free_field;
free_token(token); free_token(token);
arg->flags.field = field; 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); type = read_token_item(tok);
return type; return type;
out_free: out_free_field:
free_arg(field);
out_free:
free_token(token); free_token(token);
*tok = NULL; *tok = NULL;
return EVENT_ERROR; 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); type = process_arg(event, field, &token);
if (test_type_token(type, token, EVENT_DELIM, ",")) if (test_type_token(type, token, EVENT_DELIM, ","))
goto out_free; goto out_free_field;
arg->symbol.field = 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); type = read_token_item(tok);
return type; return type;
out_free: out_free_field:
free_arg(field);
out_free:
free_token(token); free_token(token);
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return EVENT_ERROR;