Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 8 Jan 2019 07:44:51 -0800
From:   tip-bot for Mattias Jacobsson <tipbot@zytor.com>
Message-ID: <tip-099be748865eece21362aee416c350c0b1ae34df@git.kernel.org>
Cc:     sansharm@redhat.com, jolsa@kernel.org, hpa@zytor.com,
        mingo@kernel.org, 2pi@mok.nu, tglx@linutronix.de,
        linux-kernel@vger.kernel.org, acme@redhat.com, peterz@infradead.org
Reply-To: sansharm@redhat.com, jolsa@kernel.org, hpa@zytor.com,
          mingo@kernel.org, 2pi@mok.nu, tglx@linutronix.de,
          acme@redhat.com, peterz@infradead.org,
          linux-kernel@vger.kernel.org
In-Reply-To: <20181229141750.16945-1-2pi@mok.nu>
References: <20181229141750.16945-1-2pi@mok.nu>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:perf/urgent] perf strbuf: Remove redundant va_end() in
 strbuf_addv()
Git-Commit-ID: 099be748865eece21362aee416c350c0b1ae34df
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  099be748865eece21362aee416c350c0b1ae34df
Gitweb:     https://git.kernel.org/tip/099be748865eece21362aee416c350c0b1ae34df
Author:     Mattias Jacobsson <2pi@mok.nu>
AuthorDate: Sat, 29 Dec 2018 15:17:50 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 4 Jan 2019 12:54:49 -0300

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: ce49d8436cff ("perf strbuf: Match va_{add,copy} with va_end")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/strbuf.c | 1 -
 1 file changed, 1 deletion(-)

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);