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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B5A5F138334 for ; Thu, 2 Jan 2020 15:09:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51186E09F2; Thu, 2 Jan 2020 15:09:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F22BFE09F2 for ; Thu, 2 Jan 2020 15:09:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D99634DE69 for ; Thu, 2 Jan 2020 15:09:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4B87A9 for ; Thu, 2 Jan 2020 15:09:47 +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: <1577977761.bab8be1e6ef9998ca7285310a4fd135127442500.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/ X-VCS-Repository: proj/portage-utils X-VCS-Files: libq/tree.c X-VCS-Directories: libq/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: bab8be1e6ef9998ca7285310a4fd135127442500 X-VCS-Branch: master Date: Thu, 2 Jan 2020 15:09:47 +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: 231f4ba6-ed59-4690-88bc-304c092760de X-Archives-Hash: da194dc5702264285c3f94bc9af76e7f commit: bab8be1e6ef9998ca7285310a4fd135127442500 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 2 15:09:21 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 2 15:09:21 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=bab8be1e libq/tree: ensure we don't leak scandir results on sorted foreach_pkg Signed-off-by: Fabian Groffen gentoo.org> libq/tree.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libq/tree.c b/libq/tree.c index 186fb4d..49b2fa1 100644 --- a/libq/tree.c +++ b/libq/tree.c @@ -1341,9 +1341,12 @@ tree_foreach_pkg(tree_ctx *ctx, tree_pkg_cb callback, void *priv, } /* allow foreach to be called again on the same open tree */ + if (ctx->do_sort) + scandir_free(ctx->cat_de, ctx->cat_cnt); ctx->cat_de = NULL; ctx->cat_cur = 0; ctx->cat_cnt = 0; + ctx->do_sort = 0; return ret; }