p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tools lib traceevent: Set int_array fields to NULL if freeing from error 

Had a bug where on error of parsing __print_array() where the fields are
freed after they were allocated, but since they were not set to NULL,
the freeing of the arg also tried to free the already freed fields
causing a double free.

Fix process_hex() while at it.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20160209204237.188327674@goodmis.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Steven Rostedt (Red Hat) 2016-02-09 15:40:16 -05:00 committed by Arnaldo Carvalho de Melo
parent 21a3010045
commit 9ec72eafee
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2635,6 +2635,7 @@ process_hex(struct event_format *event, struct print_arg *arg, char **tok)
free_field:
free_arg(arg->hex.field);
arg->hex.field = NULL;
out:
*tok = NULL;
return EVENT_ERROR;
@ -2659,8 +2660,10 @@ process_int_array(struct event_format *event, struct print_arg *arg, char **tok)
free_size:
free_arg(arg->int_array.count);
arg->int_array.count = NULL;
free_field:
free_arg(arg->int_array.field);
arg->int_array.field = NULL;
out:
*tok = NULL;
return EVENT_ERROR;