diff options
author | 2016-07-19 11:02:56 -0700 | |
---|---|---|
committer | 2016-07-19 11:02:56 -0700 | |
commit | 8c57a5e7b2820f349c95b8c8393fec1e0f4070d2 (patch) | |
tree | 8ef0f3c986968392ccdc70ca43b23eba729e2019 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Input: pixcir_ts - add support for axis inversion / swapping (diff) | |
parent | Input: ts4800-ts - add missing of_node_put after calling of_parse_phandle (diff) | |
download | wireguard-linux-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.tar.xz wireguard-linux-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.zip |
Merge branch 'for-linus' into next
Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 7 |
1 files changed, 5 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 d72fafc1c800..fbd05242b4e5 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -205,6 +205,9 @@ static void define_event_symbols(struct event_format *event, const char *ev_name, struct print_arg *args) { + if (args == NULL) + return; + switch (args->type) { case PRINT_NULL: break; @@ -1091,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) { @@ -1101,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(); |