mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Folder wizard: Fix infinite loop for bad paths #7041

Browse Source
This commit is contained in:
Christian Kamm 2019-02-18 14:32:47 +01:00 committed by ckamm
parent f42fdc6758
commit 0682a8d4e7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/folderman.cpp
View File

@ -1340,7 +1340,16 @@ static QString canonicalPath(const QString &path)
{
QFileInfo selFile(path);
if (!selFile.exists()) {
return canonicalPath(selFile.dir().path()) + '/' + selFile.fileName();
const auto parentPath = selFile.dir().path();
// It's possible for the parentPath to match the path
// (possibly we've arrived at a non-existant drive root on Windows)
// and recursing would be fatal.
if (parentPath == path) {
return path;
}
return canonicalPath(parentPath) + '/' + selFile.fileName();
}
return selFile.canonicalFilePath();
}