tools lib traceevent: Do not reassign parg after collapse_tree()
authorSteven Rostedt <rostedt@goodmis.org>
Wed, 11 May 2016 19:09:36 +0000 (15:09 -0400)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 12 May 2016 14:27:00 +0000 (11:27 -0300)
commit106b816cb46ebd87408b4ed99a2e16203114daa6
tree8dbbf884f7d376191523eb9068344567715ba451
parent4924734570a073049450b11f7c59ce5992b03343
tools lib traceevent: Do not reassign parg after collapse_tree()

At the end of process_filter(), collapse_tree() was changed to update
the parg parameter, but the reassignment after the call wasn't removed.

What happens is that the "current_op" gets modified and freed and parg
is assigned to the new allocated argument. But after the call to
collapse_tree(), parg is assigned again to the just freed "current_op",
and this causes the tool to crash.

The current_op variable must also be assigned to NULL in case of error,
otherwise it will cause it to be free()ed twice.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: stable@vger.kernel.org # 3.14+
Fixes: 42d6194d133c ("tools lib traceevent: Refactor process_filter()")
Link: http://lkml.kernel.org/r/20160511150936.678c18a1@gandalf.local.home
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/lib/traceevent/parse-filter.c