diff options
| author | Mattias Jacobsson <2pi@mok.nu> | 2018-12-29 15:17:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-04 19:13:24 +0100 |
| commit | 332ed88d96d8ac5d4510d8205affd1bb10e2cf6a (patch) | |
| tree | a341c387d2a9337031a110610789c737c9ac4090 | |
| parent | 74c4ed6c9cd4b6ff96ee989f6df60979e1794155 (diff) | |
| download | linux-stable-332ed88d96d8ac5d4510d8205affd1bb10e2cf6a.tar.gz linux-stable-332ed88d96d8ac5d4510d8205affd1bb10e2cf6a.tar.bz2 linux-stable-332ed88d96d8ac5d4510d8205affd1bb10e2cf6a.zip | |
perf strbuf: Remove redundant va_end() in strbuf_addv()
commit 099be748865eece21362aee416c350c0b1ae34df upstream.
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: ce49d8436cff ("perf strbuf: Match va_{add,copy} with va_end")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | tools/perf/util/strbuf.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/util/strbuf.c b/tools/perf/util/strbuf.c index 9005fbe0780e..23092fd6451d 100644 --- a/tools/perf/util/strbuf.c +++ b/tools/perf/util/strbuf.c @@ -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); |