Messages in this thread Patch in this message | | | From | Colin King <> | Subject | [PATCH] perf script: fix double free on command_line | Date | Tue, 1 Mar 2016 23:46:20 +0000 |
| |
From: Colin Ian King <colin.king@canonical.com>
command_line is free'd twice if db_export__branch_types fails. To avoid this, defer the free'ing of command_line to after this call so that the error return path will just free command_line once.
Signed-off-by: Colin Ian King <colin.king@canonical.com> --- tools/perf/util/scripting-engines/trace-event-python.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index d72fafc..e982863 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -1091,8 +1091,6 @@ static int python_start_script(const char *script, int argc, const char **argv) goto error; } - free(command_line); - set_table_handlers(tables); if (tables->db_export_mode) { @@ -1101,6 +1099,8 @@ static int python_start_script(const char *script, int argc, const char **argv) goto error; } + free(command_line); + return err; error: Py_Finalize(); -- 2.7.0
| |