Commit 099be748 authored Dec 29, 2018 by Mattias Jacobsson Committed by Arnaldo Carvalho de Melo Jan 04, 2019

perf strbuf: Remove redundant va_end() in strbuf_addv()

Each call to va_copy() should have one, and only one, corresponding call
to va_end(). In strbuf_addv() some code paths result in va_end() getting
called multiple times. Remove the superfluous va_end().

Signed-off-by: Mattias Jacobsson <2pi@mok.nu>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sanskriti Sharma <sansharm@redhat.com>
Link: http://lkml.kernel.org/r/20181229141750.16945-1-2pi@mok.nu

Fixes: ce49d843 ("perf strbuf: Match va_{add,copy} with va_end")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 442b4eb3

tools/perf/util/strbuf.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,6 @@ static int strbuf_addv(struct strbuf sb, const char fmt, va_list ap)
		return ret;
		}
		len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap_saved);
		va_end(ap_saved);
		if (len > strbuf_avail(sb)) {
		pr_debug("this should not happen, your vsnprintf is broken");
		va_end(ap_saved);

Admin message