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

Utils: clean file name before creating fs engine

Browse Source 
Change-Id: I9c4c8132ad509820e0388787ab34bf11b3c4465b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
David Schulz
2022-08-25 15:12:19 +02:00
parent 92c529b4a6
commit 5f0270ae4a
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/utils/fsengine/fsenginehandler.cpp
View File

@@ -47,10 +47,7 @@ QAbstractFileEngine *FSEngineHandler::create(const QString &fileName) const
static const FilePath rootFilePath = static const FilePath rootFilePath =
FilePath::specialFilePath(FilePath::SpecialPathComponent::RootPath); FilePath::specialFilePath(FilePath::SpecialPathComponent::RootPath);
QString fixedFileName = fileName; const QString fixedFileName = QDir::cleanPath(fileName);
if (fileName.startsWith("//"))
fixedFileName = fixedFileName.mid(1);
if (fixedFileName == rootPath) { if (fixedFileName == rootPath) {
const FilePaths paths const FilePaths paths

14
tests/auto/utils/fsengine/tst_fsengine.cpp
View File

@@ -50,6 +50,7 @@ private slots:
void testCreateDir(); void testCreateDir();
void testWindowsPaths(); void testWindowsPaths();
void testUrl(); void testUrl();
void testBrokenWindowsPath();
private: private:
QString makeTestPath(QString path, bool asUrl = false); QString makeTestPath(QString path, bool asUrl = false);
@@ -290,5 +291,18 @@ void tst_fsengine::testUrl()
QVERIFY(p.needsDevice()); QVERIFY(p.needsDevice());
} }
void tst_fsengine::testBrokenWindowsPath()
{
QTemporaryFile tmp;
QVERIFY(tmp.open());
QString localFileName = tmp.fileName();
localFileName.insert(HostOsInfo::isWindowsHost() ? 2 : 0, '/');
QFile file(localFileName);
QVERIFY(file.open(QIODevice::ReadOnly));
QCOMPARE(tmp.fileName(), QFileInfo(localFileName).canonicalFilePath());
}
QTEST_GUILESS_MAIN(tst_fsengine) QTEST_GUILESS_MAIN(tst_fsengine)
#include "tst_fsengine.moc" #include "tst_fsengine.moc"