Commit db49bc15 authored Sep 16, 2017 by Christophe JAILLET Committed by Arnaldo Carvalho de Melo Oct 23, 2017

perf script: Fix error handling path

If the string passed in '--time' is invalid, or if failed to set
libtraceevent function resolver, we must do some cleanup before leaving.
As in the other error handling paths of this function.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: kernel-janitors@vger.kernel.org
Link: http://lkml.kernel.org/r/20170916062537.28921-1-christophe.jaillet@wanadoo.fr

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent a1a58707

tools/perf/builtin-script.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -3074,7 +3074,8 @@ int cmd_script(int argc, const char **argv)
		machine__resolve_kernel_addr,
		&session->machines.host) < 0) {
		pr_err("%s: failed to set libtraceevent function resolver\n", __func__);
		return -1;
		err = -1;
		goto out_delete;
		}

		if (generate_script_lang) {
		@@ -3134,7 +3135,8 @@ int cmd_script(int argc, const char **argv)
		/* needs to be parsed after looking up reference time */
		if (perf_time__parse_str(&script.ptime, script.time_str) != 0) {
		pr_err("Invalid time string\n");
		return -EINVAL;
		err = -EINVAL;
		goto out_delete;
		}

		err = __cmd_script(&script);