From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9383A158087 for ; Sun, 6 Feb 2022 14:51:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E24642BC01C; Sun, 6 Feb 2022 14:51:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CD9B32BC01C for ; Sun, 6 Feb 2022 14:51:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6B16342D7A for ; Sun, 6 Feb 2022 14:51:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 556CD2A0 for ; Sun, 6 Feb 2022 14:51:43 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1644159098.71b1d91909da6f5cbbe2ab02e3f9045f58bd499a.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 71b1d91909da6f5cbbe2ab02e3f9045f58bd499a X-VCS-Branch: master Date: Sun, 6 Feb 2022 14:51:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 87661509-dd62-4117-977f-369e05fc6879 X-Archives-Hash: db2c5fd1dcc25b3549accbdcd133658c commit: 71b1d91909da6f5cbbe2ab02e3f9045f58bd499a Author: Fabian Groffen gentoo org> AuthorDate: Sun Feb 6 14:51:38 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Feb 6 14:51:38 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=71b1d919 qmerge: plug leak in pkg_merge Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qmerge.c b/qmerge.c index e247a38..4ce14ae 100644 --- a/qmerge.c +++ b/qmerge.c @@ -133,7 +133,7 @@ fetch(const char *destdir, const char *src) } else #endif { - char *path; + char *path = NULL; /* wget -c -q -P */ const char *argv[] = { @@ -1021,6 +1021,7 @@ pkg_merge(int level, const depend_atom *qatom, const tree_match_ctx *mpkg) ATOM_COMP_NOSUBSLOT | ATOM_COMP_NOREPO); replver = previnst->atom->PVR; } + atom_implode(slotatom); (void)qprint_tree_node(level, mpkg, previnst, replacing);