kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't recurse into symlinks when counting directory contents

Browse source 
Symlink contents should not be visited for the purpose of displaying sizes.
Not only is potentially misleading because the storage is actually used
elsewhere (the target location), it can be completely wrong as contents can
be visited multiple times, even recursively.

BUG: 434125
This commit is contained in:
Fabian Vogt 2023-01-02 14:53:42 +01:00
parent a8f3957e9d
commit 491068a440
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/kitemviews/private/kdirectorycontentscounterworker.cpp
View file

@ -62,21 +62,15 @@ KDirectoryContentsCounterWorker::CountResult walkDir(const QString &dirPath,
}
if (allowedRecursiveLevel > 0) {
bool linkFound = false;
QString nameBuf = QStringLiteral("%1/%2").arg(dirPath, dirEntry->d_name);
if (dirEntry->d_type == DT_REG || dirEntry->d_type == DT_LNK) {
if (dirEntry->d_type == DT_REG) {
if (QT_STAT(nameBuf.toLocal8Bit(), &buf) == 0) {
if (S_ISDIR(buf.st_mode)) {
// was a dir link, recurse
linkFound = true;
}
size += buf.st_size;
}
}
if (dirEntry->d_type == DT_DIR || linkFound) {
// recursion for dirs and dir links
if (dirEntry->d_type == DT_DIR) {
// recursion for dirs
size += walkDir(nameBuf, countHiddenFiles, countDirectoriesOnly, dirEntry, allowedRecursiveLevel - 1).size;
}
}