RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:47:34 +00:00
Code Issues Activity Actions

LibCore: Avoid running fstatat on skipped entries in DirIterator

Browse source 
Fixes #22630
This commit is contained in:
implicitfield 2024-01-07 02:26:00 +04:00 • committed by Andrew Kaster
parent f4ee9a2333
commit 20aa56891a
1 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Userland/Libraries/LibCore/DirIterator.cpp
View file

@ -41,6 +41,13 @@ DirIterator::DirIterator(DirIterator&& other)
other.m_dir = nullptr; other.m_dir = nullptr;
} }
static constexpr bool dirent_has_d_type =
#if defined(AK_OS_SOLARIS) || defined(AK_OS_HAIKU)
false;
#else
true;
#endif
bool DirIterator::advance_next() bool DirIterator::advance_next()
{ {
if (!m_dir) if (!m_dir)
@ -58,23 +65,10 @@ bool DirIterator::advance_next()
return false; return false;
} }
#if defined(AK_OS_SOLARIS) || defined(AK_OS_HAIKU) if constexpr (dirent_has_d_type)
m_next = DirectoryEntry::from_stat(m_dir, *de); m_next = DirectoryEntry::from_dirent(*de);
#else else
m_next = DirectoryEntry::from_dirent(*de); m_next = DirectoryEntry::from_stat(m_dir, *de);
// dirent structures from readdir aren't guaranteed to contain valid file types,
// as it is possible that the underlying filesystem doesn't keep track of those.
if (m_next->type == DirectoryEntry::Type::Unknown && !m_next->name.is_empty()) {
struct stat statbuf;
if (fstatat(dirfd(m_dir), de->d_name, &statbuf, AT_SYMLINK_NOFOLLOW) < 0) {
m_error = Error::from_errno(errno);
dbgln("DirIteration error: {}", m_error.value());
return false;
}
m_next->type = DirectoryEntry::directory_entry_type_from_stat(statbuf.st_mode);
}
#endif
if (m_next->name.is_empty()) if (m_next->name.is_empty())
return false; return false;
@ -85,6 +79,20 @@ bool DirIterator::advance_next()
if (m_flags & Flags::SkipParentAndBaseDir && (m_next->name == "." || m_next->name == "..")) if (m_flags & Flags::SkipParentAndBaseDir && (m_next->name == "." || m_next->name == ".."))
continue; continue;
if constexpr (dirent_has_d_type) {
// dirent structures from readdir aren't guaranteed to contain valid file types,
// as it is possible that the underlying filesystem doesn't keep track of those.
if (m_next->type == DirectoryEntry::Type::Unknown) {
struct stat statbuf;
if (fstatat(dirfd(m_dir), de->d_name, &statbuf, AT_SYMLINK_NOFOLLOW) < 0) {
m_error = Error::from_errno(errno);
dbgln("DirIteration error: {}", m_error.value());
return false;
}
m_next->type = DirectoryEntry::directory_entry_type_from_stat(statbuf.st_mode);
}
}
return !m_next->name.is_empty(); return !m_next->name.is_empty();
} }
} }