diff options
author | Namhyung Kim <namhyung.kim@lge.com> | 2012-05-22 22:36:50 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-05-24 10:33:53 -0400 |
commit | b3511d0530c7a2b4fa64d1f5218c5f073ae7b543 (patch) | |
tree | 4d12be6c4b46028ce684f3ec5b48f15a251479cb /tools | |
parent | d1de10870909a27ce2ac380d0671feb308826491 (diff) |
tools lib traceevent: Fix freeing arg on process_dynamic_array()
The @arg paremeter should not be freed inside of process_XXX(),
because it'd be freed from the caller of process_arg(). We can
free it only after it was reused for local usage.
Cc: Borislav Petkov <bp@alien8.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1337740619-27925-14-git-send-email-namhyung.kim@lge.com
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/lib/traceevent/event-parse.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 445a43ad42fd..355902795f0a 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c | |||
@@ -2300,17 +2300,18 @@ process_dynamic_array(struct event_format *event, struct print_arg *arg, char ** | |||
2300 | arg = alloc_arg(); | 2300 | arg = alloc_arg(); |
2301 | type = process_arg(event, arg, &token); | 2301 | type = process_arg(event, arg, &token); |
2302 | if (type == EVENT_ERROR) | 2302 | if (type == EVENT_ERROR) |
2303 | goto out_free; | 2303 | goto out_free_arg; |
2304 | 2304 | ||
2305 | if (!test_type_token(type, token, EVENT_OP, "]")) | 2305 | if (!test_type_token(type, token, EVENT_OP, "]")) |
2306 | goto out_free; | 2306 | goto out_free_arg; |
2307 | 2307 | ||
2308 | free_token(token); | 2308 | free_token(token); |
2309 | type = read_token_item(tok); | 2309 | type = read_token_item(tok); |
2310 | return type; | 2310 | return type; |
2311 | 2311 | ||
2312 | out_free_arg: | ||
2313 | free_arg(arg); | ||
2312 | out_free: | 2314 | out_free: |
2313 | free(arg); | ||
2314 | free_token(token); | 2315 | free_token(token); |
2315 | *tok = NULL; | 2316 | *tok = NULL; |
2316 | return EVENT_ERROR; | 2317 | return EVENT_ERROR; |