diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-13 05:35:12 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-13 05:35:12 (GMT) |
| commit | 636fa4a7b0d2987b7395cd2e259962cdca16e887 (patch) | |
| tree | 94e3776eeff15c96c30f32a09d63ad3bcb9fdc84 /tools/lib/traceevent/parse-filter.c | |
| parent | 9f448cd3cbcec8995935e60b27802ae56aac8cc0 (diff) | |
| parent | 42ef8a78c1f49f53f29f0f3a6f9a5bcbc653233e (diff) | |
| download | linux-636fa4a7b0d2987b7395cd2e259962cdca16e887.tar.xz | |
Merge tag 'perf-urgent-for-mingo-20160512' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
- Fallback to usermode-only counters when perf_event_paranoid > 1, which
is the case now (Arnaldo Carvalho de Melo)
- Do not reassign parg after collapse_tree() in libtraceevent, which
may cause tool crashes (Steven Rostedt)
- Fix the build on Fedora Rawhide, where readdir_r() is deprecated and
also wrt -Werror=unused-const-variable= + x86_32_regoffset_table on
!x86_64 (Arnaldo Carvalho de Melo)
- Fix the build on Ubuntu 12.04.5, where dwarf_getlocations() isn't
available, i.e. libdw-dev < 0.157 (Arnaldo Carvalho de Melo)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib/traceevent/parse-filter.c')
| -rw-r--r-- | tools/lib/traceevent/parse-filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c index 0144b3d..88cccea 100644 --- a/tools/lib/traceevent/parse-filter.c +++ b/tools/lib/traceevent/parse-filter.c @@ -1164,11 +1164,11 @@ process_filter(struct event_format *event, struct filter_arg **parg, current_op = current_exp; ret = collapse_tree(current_op, parg, error_str); + /* collapse_tree() may free current_op, and updates parg accordingly */ + current_op = NULL; if (ret < 0) goto fail; - *parg = current_op; - free(token); return 0; |