feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Don't follow symlinks to directories.

Browse Source 
Symlinks may create a directory loop, causing QtCreator to hang.

Change-Id: I701811bc2cc6d3c9efd8b51c1b80c7e5b4aa06ea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Jędrzej Nowacki
2012-01-05 15:16:26 +01:00
committed by Oswald Buddenhagen
parent fad4599174
commit 500a995930
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -521,7 +521,7 @@ static QSet<Utils::FileName> recursiveEnumerate(const QString &folder)
dir.setFilter(dir.filter() | QDir::NoDotAndDotDot); dir.setFilter(dir.filter() | QDir::NoDotAndDotDot);
foreach (const QFileInfo &file, dir.entryInfoList()) { foreach (const QFileInfo &file, dir.entryInfoList()) {
if (file.isDir()) if (file.isDir() && !file.isSymLink())
result += recursiveEnumerate(file.absoluteFilePath()); result += recursiveEnumerate(file.absoluteFilePath());
else else
result += Utils::FileName(file); result += Utils::FileName(file);