diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-05-18 06:29:23 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-05-18 06:29:23 -0300 |
| commit | 4ddd4fd497da1dfd99aa197eaca053d1b3da8eaf (patch) | |
| tree | 838cc4aec431f1331bc834691e962fb4a39c8897 /tools/lib | |
| parent | aff093d4bbca91f543e24cde2135f393b8130f4b (diff) | |
| parent | 2dcd0af568b0cf583645c8a317dd12e344b1c72a (diff) | |
Merge tag 'v4.6' into patchwork
Linux 4.6
* tag 'v4.6': (163 commits)
Linux 4.6
arm64: bpf: jit JMP_JSET_{X,K}
net/route: enforce hoplimit max value
nf_conntrack: avoid kernel pointer value leak in slab name
drivers: net: xgene: fix register offset
drivers: net: xgene: fix statistics counters race condition
drivers: net: xgene: fix ununiform latency across queues
drivers: net: xgene: fix sharing of irqs
drivers: net: xgene: fix IPv4 forward crash
xen-netback: fix extra_info handling in xenvif_tx_err()
mm: thp: calculate the mapcount correctly for THP pages during WP faults
ksm: fix conflict between mmput and scan_get_next_rmap_item
ocfs2: fix posix_acl_create deadlock
ocfs2: revert using ocfs2_acl_chmod to avoid inode cluster lock hang
net: mvneta: bm: fix dependencies again
perf stat: Fallback to user only counters when perf_event_paranoid > 1
perf evsel: Handle EACCESS + perf_event_paranoid=2 in fallback()
drm/amdgpu: fix DP mode validation
drm/radeon: fix DP mode validation
perf evsel: Improve EPERM error handling in open_strerror()
...
Diffstat (limited to 'tools/lib')
| -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 0144b3d1bb77..88cccea3ca99 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; |