Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp9168570imu; Sat, 29 Dec 2018 11:59:44 -0800 (PST) X-Google-Smtp-Source: AFSGD/U4P2z6FUyY0T9R5lfKdb2gako9EP0lxt42nL468Tn2DY6/9ZdY5+KlnrvF0VpAst/k8FVJ X-Received: by 2002:a62:fc52:: with SMTP id e79mr33150189pfh.8.1546113583975; Sat, 29 Dec 2018 11:59:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546113583; cv=none; d=google.com; s=arc-20160816; b=R1psJTheUNZdwiVIOT85ZpqJm1/Mwz7dt0pnO4C8aHm4SSU8lZl5UMXZMcDNyE225U p9FQQFecw43rV3eDVOWl6996Yw8fBZNmJad5DD3jgfesyL3u1xQWkwV1ce674wsCbGA/ DZTZXH9iSV9++tDwcJF0yEMSuELoAmn0scoDuFnS5t5sQ+McGOzRiUgYyuxoL4DIlUib w0ovuQdOaJml0rqVPAf42vPtJw+TAAJiezVzwvXC72+geQKHIqzKVepgoqTRhLjPiAFc QTXXZNwHQYhW2e2838GwDXtXeSuq3lU7oVo5WE8F82xYAhG8aPCUgCN0WZL5cWcO4vON wnbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Dv92NMX0OAnsxm0HH/arkNyTMwN5+XlmrEmUAQ3JJP8=; b=A7JVYis5Lpw21Y8+0P/uJ+rZqEcX6AH8is5HbgjMcdS4pDj+9aN/L9dJUIWJmkp4Pm sp7FaFhlKSRs16Y/kJjuYARCNUkI4OU0eGGwiNg5VfPUCvTTBkTtrL0D65i8lX8dtk47 Sf7CjxMntTuxZDSYZjCiqNbQSL8ArwNzkuAWTnIFl41epbpouxOqwmvDV+nGKT7fXKnm r1hwytjZuCzrQDjTWeRDSfYk6BUOqzSvEdIVXppRd32dsaQHvov0yfH7Y7bq4l5v1RZP uVYLqmWMqfOFN10vIH97HoOaTh45jQcOsAVYSNUTVUp4QvT2H62tvqCp3Rb/P1SdNJ2o rccA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mok.nu Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u69si2353190pfj.219.2018.12.29.11.59.28; Sat, 29 Dec 2018 11:59:43 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mok.nu Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726079AbeL2OTF (ORCPT + 99 others); Sat, 29 Dec 2018 09:19:05 -0500 Received: from mail-gw01.fsdata.se ([89.221.252.212]:22140 "EHLO mail-gw01.fsdata.se" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725872AbeL2OTF (ORCPT ); Sat, 29 Dec 2018 09:19:05 -0500 Received: from localhost (94.234.42.166) by DAG01.HMC.local (192.168.46.11) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Sat, 29 Dec 2018 15:18:49 +0100 From: Mattias Jacobsson <2pi@mok.nu> To: , , CC: , , <2pi@mok.nu> Subject: [PATCH] perf tools: util: remove redundant va_end() in strbuf_addv() Date: Sat, 29 Dec 2018 15:17:50 +0100 Message-ID: <20181229141750.16945-1-2pi@mok.nu> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [94.234.42.166] X-ClientProxiedBy: PROXY04.HMC.local (192.168.46.54) To DAG01.HMC.local (192.168.46.11) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(). Fixes: ce49d8436cff ("perf strbuf: Match va_{add,copy} with va_end") Signed-off-by: Mattias Jacobsson <2pi@mok.nu> --- 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); -- 2.20.1