Guard against infinite loop

qgis · Jun 22, 2018 · b2eedd3 · b2eedd3
1 parent 58548e0
commit b2eedd3
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/core/qgsfileutils.cpp b/src/core/qgsfileutils.cpp
@@ -17,6 +17,7 @@
 #include <QRegularExpression>
 #include <QFileInfo>
 #include <QDir>
+#include <QSet>
 
 QString QgsFileUtils::representFileSize( qint64 bytes )
 {
@@ -106,12 +107,17 @@ QString QgsFileUtils::findClosestExistingPath( const QString &path )
   else
     currentPath = QDir( path );
 
+  QSet< QString > visited;
   while ( !currentPath.exists() )
   {
     const QString parentPath = QDir::cleanPath( currentPath.path() + QStringLiteral( "/.." ) );
+    if ( visited.contains( parentPath ) )
+      return QString(); // break circular links
+
     if ( parentPath.isEmpty() || parentPath == '.' )
       return QString();
     currentPath = QDir( parentPath );
+    visited << parentPath;
   }
 
   const QString res = QDir::cleanPath( currentPath.path() );