Commit 979ac257 authored by Colin Ian King's avatar Colin Ian King Committed by Arnaldo Carvalho de Melo

perf script: Fix double free on command_line

The 'command_line' variable 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: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Javi Merino <javi.merino@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1456875980-25606-1-git-send-email-colin.king@canonical.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 67678793
...@@ -1094,8 +1094,6 @@ static int python_start_script(const char *script, int argc, const char **argv) ...@@ -1094,8 +1094,6 @@ static int python_start_script(const char *script, int argc, const char **argv)
goto error; goto error;
} }
free(command_line);
set_table_handlers(tables); set_table_handlers(tables);
if (tables->db_export_mode) { if (tables->db_export_mode) {
...@@ -1104,6 +1102,8 @@ static int python_start_script(const char *script, int argc, const char **argv) ...@@ -1104,6 +1102,8 @@ static int python_start_script(const char *script, int argc, const char **argv)
goto error; goto error;
} }
free(command_line);
return err; return err;
error: error:
Py_Finalize(); Py_Finalize();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment