Skip to content

Prefer fstatat + dirfd to cf_strlcat and then stat #5517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AZero13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prefer fstatat + dirfd to cf_strlcat and then stat #5517

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions Sources/CoreFoundation/CFFileUtilities.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,15 +455,24 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc,
#endif
Boolean isDir = (dp->d_type == DT_DIR);
if (!isDir) {
// Ugh; must stat.
char subdirPath[CFMaxPathLength];
struct statinfo statBuf;
cf_strlcpy(subdirPath, dirPath, sizeof(subdirPath));
cf_strlcat(subdirPath, "/", sizeof(subdirPath));
cf_strlcat(subdirPath, dp->d_name, sizeof(subdirPath));
if (stat(subdirPath, &statBuf) == 0) {
#if TARGET_OS_WASI
// WASI doesn't support dirfd/fstatat, fall back to stat

@jmschonfeld jmschonfeld Jul 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MaxDesiatov just confirming - is this correct?

if (pathLength + 1 + namelen < CFMaxPathLength) {
char subdirPath[CFMaxPathLength];
cf_strlcpy(subdirPath, dirPath, sizeof(subdirPath));
cf_strlcat(subdirPath, "/", sizeof(subdirPath));
cf_strlcat(subdirPath, dp->d_name, sizeof(subdirPath));
if (stat(subdirPath, &statBuf) == 0) {
isDir = ((statBuf.st_mode & S_IFMT) == S_IFDIR);
}
}
#else
int dirfd_fd = dirfd(dirp);
if (dirfd_fd >= 0 && fstatat(dirfd_fd, dp->d_name, &statBuf, 0) == 0) {
isDir = ((statBuf.st_mode & S_IFMT) == S_IFDIR);
}
#endif
}
#if TARGET_OS_LINUX || TARGET_OS_WASI
fileURL = CFURLCreateFromFileSystemRepresentationRelativeToBase(alloc, (uint8_t *)dp->d_name, namelen, isDir, dirURL);
Expand Down