From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF139C433E0 for ; Thu, 21 May 2020 13:33:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B40E22072C for ; Thu, 21 May 2020 13:33:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729492AbgEUNdM (ORCPT ); Thu, 21 May 2020 09:33:12 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4880 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729362AbgEUNdK (ORCPT ); Thu, 21 May 2020 09:33:10 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 009C0D8D6EC6CD8FA4B6; Thu, 21 May 2020 21:33:09 +0800 (CST) Received: from euler.huawei.com (10.175.124.27) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Thu, 21 May 2020 21:32:57 +0800 From: Wei Li To: Alexander Shishkin , "Arnaldo Carvalho de Melo" , Jiri Olsa , Mark Rutland , Namhyung Kim CC: , Li Bin , "Xie XiuQi" , Hongbo Yao Subject: [PATCH 3/4] perf util: Fix memory leak of prefix_if_not_in Date: Thu, 21 May 2020 21:32:17 +0800 Message-ID: <20200521133218.30150-4-liwei391@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200521133218.30150-1-liwei391@huawei.com> References: <20200521133218.30150-1-liwei391@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.124.27] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xie XiuQi Need to free "str" before return when asprintf() failed to avoid memory leak. Signed-off-by: Xie XiuQi --- tools/perf/util/sort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index f14cc728c358..8ed777565c82 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -2811,7 +2811,7 @@ static char *prefix_if_not_in(const char *pre, char *str) return str; if (asprintf(&n, "%s,%s", pre, str) < 0) - return NULL; + n = NULL; free(str); return n; -- 2.17.1