3 files changed, 33 insertions, 1 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 49d8a7b4f7..d1c9be213b 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -190,7 +190,7 @@ inline void QDirPrivate::resolveAbsoluteEntry() const
 
     QString absoluteName;
     if (fileEngine.isNull()) {
-        if (!dirEntry.isRelative()) {
+        if (!dirEntry.isRelative() && dirEntry.isClean()) {
             absoluteDirEntry = dirEntry;
             return;
         }
diff --git a/src/corelib/io/qfilesystementry.cpp b/src/corelib/io/qfilesystementry.cpp
index bb7cb4e6ab..2f37542f66 100644
--- a/src/corelib/io/qfilesystementry.cpp
+++ b/src/corelib/io/qfilesystementry.cpp
@@ -380,4 +380,35 @@ void QFileSystemEntry::findFileNameSeparators() const
     }
 }
 
+bool QFileSystemEntry::isClean() const
+{
+    resolveFilePath();
+    int dots = 0;
+    bool dotok = true; // checking for ".." or "." starts to relative paths
+    bool slashok = true;
+    for (QString::const_iterator iter = m_filePath.constBegin(); iter != m_filePath.constEnd(); iter++) {
+        if (*iter == QLatin1Char('/')) {
+            if (dots == 1 || dots == 2)
+                return false; // path contains "./" or "../"
+            if (!slashok)
+                return false; // path contains "//"
+            dots = 0;
+            dotok = true;
+            slashok = false;
+        } else if (dotok) {
+            slashok = true;
+            if (*iter == QLatin1Char('.')) {
+                dots++;
+                if (dots > 2)
+                    dotok = false;
+            } else {
+                //path element contains a character other than '.', it's clean
+                dots = 0;
+                dotok = false;
+            }
+        }
+    }
+    return (dots != 1 && dots != 2); // clean if path doesn't end in . or ..
+}
+
 QT_END_NAMESPACE
diff --git a/src/corelib/io/qfilesystementry_p.h b/src/corelib/io/qfilesystementry_p.h
index 34b083a03e..8d524c087e 100644
--- a/src/corelib/io/qfilesystementry_p.h
+++ b/src/corelib/io/qfilesystementry_p.h
@@ -91,6 +91,7 @@ public:
     QString completeSuffix() const;
     bool isAbsolute() const;
     bool isRelative() const;
+    bool isClean() const;
 
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     bool isDriveRoot() const;