From nobody Tue Jan 28 16:00:56 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yj94S5xwnz5lfmr; Tue, 28 Jan 2025 16:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yj94S42kYz3mPv; Tue, 28 Jan 2025 16:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738080056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhvGMRVV9G0ucV0JyLfKysQZPJQE6nZTHzQdJhAMEpo=; b=EPWKaamBFi/5gNxic2vto3FIf4A7UAk1GJLl3L+W042CEK0NCPbFPm6duZvMisDH8i551y gcIZHcy4uRquSkGpHj+y7mS35vnyr4p/bdlyLrxU3apsq8l9Q0stj0fzPrAuZfzAKQWUsN eWxfyQuhDqoF3fq5LMwb1QFsRYNW2naD4t7qm2V0b94Q4N8MKa3s3joTy1GOweQseErOCI z5FPe6PpPcxhL2T6Su3P5F4pTnUttqLV+PHOCYivxONjuSsthniNDLuAk2lU8LYjvas1tM AzGkBDtohLbObBl+6tBZhj0YZwWXiw+TtbW7dRVqnPNf6GoxquK7Yu0wHov1CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738080056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhvGMRVV9G0ucV0JyLfKysQZPJQE6nZTHzQdJhAMEpo=; b=x3DXSRzO+/n1Iydir/29+gpFJ82u7Mylud8C4vPkyWH+HfAHh/L1+6+H5KbP5Q5XE7mrTL ypEle3dJ5/lGj6w1bBMqcYjXu72B75tuBjGxlVWA/xGMlLiOu4MqxnzdgBAYszPjRlFDxP IRw4yr4Lou2wYnxdgcityChy4CxnGHJ94l/NGdALpOnjPycWBWRc3EmG1NNDgAF7t2obiT OqZrvX8ThQbOlFxwGnuSGUgtsMhoxpB+2rlA6gAzsqi7bDmolabDMTDrZggQIN2sO685Md w/RK9tYu2zzpMwWWkroI4ay8LqucQiBFQ1XgS2WL8H6yLOEpx62UZExjl+ZuaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738080056; a=rsa-sha256; cv=none; b=x4xGh4wuMzBRMKdBI60QGUhca80TaVnibOiq/rrN5LYT0k0L/Q3qFHwreRgYs4dWKyOWrb ys+fb0AVQToGz8Z3KjkWvEf++mfx5vOKMUaMkkIa8AvoilGgEfMkUFXDXtV4E14cbczX+C V/5WpNinAByMiQ3sLTzVlX0LgfXpZexC16m8St20xiSWXGw4HwX9rrRSN7oN/2znxXdH7e 7P/As+K8pwkoSNDQvtqdbdkDbiSGPYdlQCJCjMsknpoYelcMhg6vNYEH7Xp4QI9wE7rs3r lvkpgFT52PV25fHUJoPnDtgmKyeQdYDrHqte2r9VbNM1AZx0nTcFtBtmlLI2gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yj94S3fNXz5sB; Tue, 28 Jan 2025 16:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50SG0uQY038084; Tue, 28 Jan 2025 16:00:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SG0uM0038081; Tue, 28 Jan 2025 16:00:56 GMT (envelope-from git) Date: Tue, 28 Jan 2025 16:00:56 GMT Message-Id: <202501281600.50SG0uM0038081@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 66ff03065def - stable/14 - ls: Release resources before returning from traverse() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 66ff03065defb26bc2cdec5874c0be88343541c8 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=66ff03065defb26bc2cdec5874c0be88343541c8 commit 66ff03065defb26bc2cdec5874c0be88343541c8 Author: Mark Johnston AuthorDate: 2025-01-14 14:20:26 +0000 Commit: Mark Johnston CommitDate: 2025-01-28 16:00:12 +0000 ls: Release resources before returning from traverse() PR: 278476 MFC after: 2 weeks Reported by: valgrind (cherry picked from commit e6c9c463384d11a44af3e5f2cc947fb69f3a1968) --- bin/ls/ls.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 1ad346440f02..51cd45b84d63 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -655,8 +655,10 @@ traverse(int argc, char *argv[], int options) chp = fts_children(ftsp, 0); if (chp != NULL) display(NULL, chp, options); - if (f_listdir) + if (f_listdir) { + fts_close(ftsp); return; + } /* * If not recursing down this tree and don't need stat info, just get @@ -705,6 +707,7 @@ traverse(int argc, char *argv[], int options) } if (errno) err(1, "fts_read"); + fts_close(ftsp); } /*