summaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2016-03-01 23:46:20 +0000
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-03-03 11:10:37 -0300
commit979ac257b00c53aacec3eacf86142e8c00bee889 (patch)
treef640a1f3e9d0a51c56bec2f79bd684fad86e4ebb /tools/perf
parent676787939ef8ccfcf8039104f766ebe5ebe23924 (diff)
downloadop-kernel-dev-979ac257b00c53aacec3eacf86142e8c00bee889.zip
op-kernel-dev-979ac257b00c53aacec3eacf86142e8c00bee889.tar.gz
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: Colin Ian King <colin.king@canonical.com> Acked-by: Jiri 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.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/scripting-engines/trace-event-python.c4
1 files 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 309d90f..fbd0524 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -1094,8 +1094,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) {
@@ -1104,6 +1102,8 @@ static int python_start_script(const char *script, int argc, const char **argv)
goto error;
}
+ free(command_line);
+
return err;
error:
Py_Finalize();
OpenPOWER on IntegriCloud