From nobody Thu Feb 5 15:27:22 2026 X-Original-To: dev-commits-src-all@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 4f6Lgb1y5Zz6QkqT for ; Thu, 05 Feb 2026 15:27:23 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6LgZ6mhwz3XKZ for ; Thu, 05 Feb 2026 15:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305243; 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=WW4fo4aP7sLL4puY/vNuKX5v4Lz/P5QvYkNxLbctOB8=; b=mpd4uARZQVaTYk/25XY5EpNB4FOHICetznvzhqzKsyHTFQtijdefCcMbXErYXS9pGQvrYq ipTUGQZNBeJawyqRbfMClb1Q4FWEgJCT7JeGtpmeHpep2VZLUiwlRvtF4DhHDrO8VwQyhS MlHoJGxtykB4m3mjo5FXXKxRoHYdTYPjVUgrQHUCFi4bIp/OwmanoUmxQVmhkATp9yty4n eckOOc06RBngKCFrksS32/ssc5d7SXBi/NSPKIMaZjgazK/7FFsLKJC6hy71Dk87qDw+Q2 gpxTI49GNu1/bCZ3Zka3yxUvvE9ftZSAmgaFL9pCMCeatfLtggTAFKAb1H+nwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770305243; a=rsa-sha256; cv=none; b=xfm2Jrfe4xI97vwHnH3B1uk1KCeFwjGZpPu1JAkNB3D9qnSAzfrJIl8Z3velnbQsiEfK0P jqMzA7qXfIEiYl95cxbTeM3BFlTHDHfpQ/C33RnrVo7AF7lpZXYXzG9GLnEyWtYssfmAdm LCEF36DihcK9GCtPKQhuX8PHIoTzBvnb5ytXcMNkGTSOoQOQgJ/UBZSOcMPjfuEZ6YaLom 4LzJvoZKFKTUw98pR0XMzyhB4o1M0HfI7U4LUcTN/DYL7Ortaa5Zazbv+8CpxevuHBoqsl btTacCkKar/Ujaybx8trUBJaGj0X5FJyrVx+mOQPjr5V3t4SYNVNNiWXJghXLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305243; 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=WW4fo4aP7sLL4puY/vNuKX5v4Lz/P5QvYkNxLbctOB8=; b=aBqCIfAec6l1jxbIIFzZ3dXPJRBvgYc9f5aLH1GQPk7AFHEYpbV/QZLYP1ZaMycXFhlhln MyhQ9jcsz9F+Qx+TPXI10HeO/S2OL/OQh0Bvwaq1kF7jv1DuS7IRNyd7SJ5xZeXpm+8byA CN/RwsZ8A2RRceXKxTe2SISIvOPKrp3JGUYcpRtpygqb93A3FeGic6lzoO7JA6oBGFzp5/ x2u9Ppc6r/lFimmoeZMThwKO2mqhhHab8czH+RWKM4EcKBYQ1OCkcjR7HzPxcdFQgI8p/8 C7+QMV20KvSEaXrV3i/jZNY53HOqmH7sULeJNAP14/LSjAe7lamSIhE7l47q9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6LgZ6GYfzc2P for ; Thu, 05 Feb 2026 15:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18324 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:27:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 90c5d1b5f423 - stable/14 - scandir: Fix behavior when no entries match. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 90c5d1b5f4238823414a82b72e7f80d9e83a3de6 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:27:22 +0000 Message-Id: <6984b6da.18324.3945b4d7@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=90c5d1b5f4238823414a82b72e7f80d9e83a3de6 commit 90c5d1b5f4238823414a82b72e7f80d9e83a3de6 Author: Dag-Erling Smørgrav AuthorDate: 2025-06-20 16:13:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:47:46 +0000 scandir: Fix behavior when no entries match. In the previous commit, I removed the initial initialization of the `names` array, not realizing that `scandir()` is expected to return a non-null (but empty) array of entries if no entries matched. Restore the historical behavior, document it, and add a test. Fixes: deeebfdecab5 Sponsored by: Klara, Inc. Reviewed by: kevans, allanjude, markj Differential Revision: https://reviews.freebsd.org/D50949 (cherry picked from commit c187b673bb79905b5d5db1eb34d5a893c4464eeb) --- lib/libc/gen/scandir.3 | 5 +++-- lib/libc/gen/scandir.c | 6 +++++- lib/libc/tests/gen/scandir_test.c | 22 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3 index d9ae8f687168..c55c69eeca24 100644 --- a/lib/libc/gen/scandir.3 +++ b/lib/libc/gen/scandir.3 @@ -27,7 +27,7 @@ .\" .\" @(#)scandir.3 8.1 (Berkeley) 6/4/93 .\" -.Dd June 19, 2025 +.Dd June 20, 2025 .Dt SCANDIR 3 .Os .Sh NAME @@ -104,7 +104,8 @@ entries using It returns the number of entries in the array. A pointer to the array of directory entries is stored in the location referenced by -.Fa namelist . +.Fa namelist +(even if no entries were selected). .Pp The .Fa select diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c index 54f92bafc115..36abe9f37047 100644 --- a/lib/libc/gen/scandir.c +++ b/lib/libc/gen/scandir.c @@ -76,9 +76,13 @@ scandir_dirp(DIR *dirp, struct dirent ***namelist, #endif { struct dirent *d, *p = NULL, **names = NULL, **names2; - size_t arraysz = 0, numitems = 0; + size_t arraysz = 32, numitems = 0; int serrno; + names = malloc(arraysz * sizeof(*names)); + if (names == NULL) + return (-1); + while ((d = readdir(dirp)) != NULL) { if (select != NULL && !SELECT(d)) continue; /* just selected names */ diff --git a/lib/libc/tests/gen/scandir_test.c b/lib/libc/tests/gen/scandir_test.c index 54848c0572ca..dcd73fe94df5 100644 --- a/lib/libc/tests/gen/scandir_test.c +++ b/lib/libc/tests/gen/scandir_test.c @@ -103,10 +103,32 @@ ATF_TC_BODY(scandirat_test, tc) ATF_REQUIRE_EQ(0, close(fd)); } +static int +scandir_none(const struct dirent *ent __unused) +{ + return (0); +} + +ATF_TC(scandir_none); +ATF_TC_HEAD(scandir_none, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test scandir() when no entries are selected"); +} +ATF_TC_BODY(scandir_none, tc) +{ + struct dirent **namelist = NULL; + + ATF_REQUIRE_EQ(0, scandir(".", &namelist, scandir_none, alphasort)); + ATF_REQUIRE(namelist); + free(namelist); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, scandir_test); ATF_TP_ADD_TC(tp, fscandir_test); ATF_TP_ADD_TC(tp, scandirat_test); + ATF_TP_ADD_TC(tp, scandir_none); return (atf_no_error()); }