From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 10E521F8C6 for ; Sun, 25 Jul 2021 13:10:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231156AbhGYM3a (ORCPT ); Sun, 25 Jul 2021 08:29:30 -0400 Received: from mx.kolabnow.com ([95.128.36.40]:26178 "EHLO mx.kolabnow.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230439AbhGYM27 (ORCPT ); Sun, 25 Jul 2021 08:28:59 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTP id 60D54AB0; Sun, 25 Jul 2021 15:08:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:date:subject:subject:from:from:received :received:received; s=dkim20160331; t=1627218538; x=1629032939; bh=UDRNazhZu0xBcWUdwt7tGXsgsS8NzC9xF8uRW9jYJLA=; b=tma95Vbs67vA NLpScbqpcyJ+M0+l7f9Y2Yr/q7APqkNmGSjQ3EiWDWGOqIKqFuXeqVH+Js44mAec T4MVkczb+vOYFvIwxT9/FSHkKEtHi6R9Yjct4JCrHdI5APh7u+PU14YtUjTVQdz1 Ao0Sq9Giz+WcuHbZXRPSEPwrE+++PpjVOteecrAJk3wkHkcX906p/BdPR4zr8BP9 91oluE75PRpenifb2fmAZ6EjaqSRS1oukBJqDbVsD3gyWDqVhh2pwWzYrFkBvrsU tFBntAbpvYQKqNEC4Wfp14MmqU0mQ4aTOa9SGexCbAWPiS2bKKKhMGlBlTBdmYi9 Lc/OJvYERT3xL4epea13jct9t3ylpU2tnYPXQv23z2RUUVMa307wxb6nnqFsmVQF qDG3DTt7LUG8HHEb7/W1uPeADRiyuqEMyMA2P/GpFjO4xhVLt1UFhYYiwYwr1uU/ gx7KUhHXT3rp/ps2gFwSoTYKhcyBayKGmQypvqIgWs14+/BUy7lR0J1B2ETiVBMe +HNVEebJRiOtxSXSInv0hY6SBRSXWQrfVnRdmCmXnl4++Gh/eZoh6vfJzbjGl0Xs M4s3QZHUDgLF8YZZX5RyZyllK1UsX4pLKBFlUb99R8nV4XOazs/uCpEGXhipn476 FA8ifBWc/251BUot00sRjyxOKmOSOCE= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A_t2TZl90Eru; Sun, 25 Jul 2021 15:08:58 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTPS id C5907702; Sun, 25 Jul 2021 15:08:57 +0200 (CEST) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 4A75817C; Sun, 25 Jul 2021 15:08:55 +0200 (CEST) From: andrzej@ahunt.org To: git@vger.kernel.org Cc: andrzej@ahunt.org, phillip.wood123@gmail.com, newren@gmail.com Subject: [PATCH v2 10/12] builtin/merge: free found_ref when done Date: Sun, 25 Jul 2021 15:08:28 +0200 Message-Id: <20210725130830.5145-11-andrzej@ahunt.org> In-Reply-To: <20210725130830.5145-1-andrzej@ahunt.org> References: <20210620151204.19260-1-andrzej@ahunt.org> <20210725130830.5145-1-andrzej@ahunt.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Andrzej Hunt merge_name() calls dwim_ref(), which allocates a new string into found_ref. Therefore add a free() to avoid leaking found_ref. LSAN output from t0021: Direct leak of 16 byte(s) in 1 object(s) allocated from: #0 0x486804 in strdup ../projects/compiler-rt/lib/asan/asan_interceptors.cpp:452:3 #1 0xa8beb8 in xstrdup wrapper.c:29:14 #2 0x954054 in expand_ref refs.c:671:12 #3 0x953cb6 in repo_dwim_ref refs.c:644:22 #4 0x5d3759 in dwim_ref refs.h:162:9 #5 0x5d3759 in merge_name builtin/merge.c:517:6 #6 0x5d3759 in collect_parents builtin/merge.c:1214:5 #7 0x5cf60d in cmd_merge builtin/merge.c:1458:16 #8 0x4ce83e in run_builtin git.c:475:11 #9 0x4ccafe in handle_builtin git.c:729:3 #10 0x4cb01c in run_argv git.c:818:4 #11 0x4cb01c in cmd_main git.c:949:19 #12 0x6bdbfd in main common-main.c:52:11 #13 0x7f0430502349 in __libc_start_main (/lib64/libc.so.6+0x24349) SUMMARY: AddressSanitizer: 16 byte(s) leaked in 1 allocation(s). Signed-off-by: Andrzej Hunt --- builtin/merge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/merge.c b/builtin/merge.c index a8a843b1f5..7ad85c044a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -503,7 +503,7 @@ static void merge_name(const char *remote, struct strbuf *msg) struct strbuf bname = STRBUF_INIT; struct merge_remote_desc *desc; const char *ptr; - char *found_ref; + char *found_ref = NULL; int len, early; strbuf_branchname(&bname, remote, 0); @@ -586,6 +586,7 @@ static void merge_name(const char *remote, struct strbuf *msg) strbuf_addf(msg, "%s\t\tcommit '%s'\n", oid_to_hex(&remote_head->object.oid), remote); cleanup: + free(found_ref); strbuf_release(&buf); strbuf_release(&bname); } -- 2.26.2