1 files changed, 105 insertions, 33 deletions

diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp
index 8c015a1c2..044eeb34f 100644
--- a/src/libs/installer/fileutils.cpp
+++ b/src/libs/installer/fileutils.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -66,54 +66,62 @@ using namespace QInstaller;
 
 /*!
     \inmodule QtInstallerFramework
-    \class QInstaller::TempDirDeleter
+    \class QInstaller::TempPathDeleter
     \internal
 */
 
 // -- TempDirDeleter
 
-TempDirDeleter::TempDirDeleter(const QString &path)
+TempPathDeleter::TempPathDeleter(const QString &path)
 {
     m_paths.insert(path);
 }
 
-TempDirDeleter::TempDirDeleter(const QStringList &paths)
-    : m_paths(paths.toSet())
+TempPathDeleter::TempPathDeleter(const QStringList &paths)
+    : m_paths(QSet<QString>(paths.begin(), paths.end()))
 {
 }
 
-TempDirDeleter::~TempDirDeleter()
+TempPathDeleter::~TempPathDeleter()
 {
     releaseAndDeleteAll();
 }
 
-QStringList TempDirDeleter::paths() const
+QStringList TempPathDeleter::paths() const
 {
-    return m_paths.toList();
+    return m_paths.values();
 }
 
-void TempDirDeleter::add(const QString &path)
+void TempPathDeleter::add(const QString &path)
 {
     m_paths.insert(path);
 }
 
-void TempDirDeleter::add(const QStringList &paths)
+void TempPathDeleter::add(const QStringList &paths)
 {
-    m_paths += paths.toSet();
+    m_paths += QSet<QString>(paths.begin(), paths.end());
 }
 
-void TempDirDeleter::releaseAndDeleteAll()
+void TempPathDeleter::releaseAndDeleteAll()
 {
     foreach (const QString &path, m_paths)
         releaseAndDelete(path);
 }
 
-void TempDirDeleter::releaseAndDelete(const QString &path)
+void TempPathDeleter::releaseAndDelete(const QString &path)
 {
     if (m_paths.contains(path)) {
         try {
             m_paths.remove(path);
-            removeDirectory(path);
+            if (QFileInfo(path).isDir()) {
+                removeDirectory(path);
+                return;
+            }
+            QFile file(path);
+            if (file.exists() && !file.remove()) {
+                throw Error(QCoreApplication::translate("QInstaller",
+                    "Cannot remove file \"%1\": %2").arg(file.fileName(), file.errorString()));
+            }
         } catch (const Error &e) {
             qCritical() << Q_FUNC_INFO << "Exception caught:" << e.message();
         } catch (...) {
@@ -363,7 +371,7 @@ bool QInstaller::setDefaultFilePermissions(QFile *file, DefaultFilePermissions p
 void QInstaller::copyDirectoryContents(const QString &sourceDir, const QString &targetDir)
 {
     Q_ASSERT(QFileInfo(sourceDir).isDir());
-    Q_ASSERT(!QFileInfo(targetDir).exists() || QFileInfo(targetDir).isDir());
+    Q_ASSERT(!QFileInfo::exists(targetDir) || QFileInfo(targetDir).isDir());
     if (!QDir().mkpath(targetDir)) {
         throw Error(QCoreApplication::translate("QInstaller", "Cannot create directory \"%1\".")
             .arg(QDir::toNativeSeparators(targetDir)));
@@ -394,7 +402,7 @@ void QInstaller::copyDirectoryContents(const QString &sourceDir, const QString &
 void QInstaller::moveDirectoryContents(const QString &sourceDir, const QString &targetDir)
 {
     Q_ASSERT(QFileInfo(sourceDir).isDir());
-    Q_ASSERT(!QFileInfo(targetDir).exists() || QFileInfo(targetDir).isDir());
+    Q_ASSERT(!QFileInfo::exists(targetDir) || QFileInfo(targetDir).isDir());
     if (!QDir().mkpath(targetDir)) {
         throw Error(QCoreApplication::translate("QInstaller", "Cannot create directory \"%1\".")
             .arg(QDir::toNativeSeparators(targetDir)));
@@ -449,26 +457,82 @@ void QInstaller::mkpath(const QString &path)
 /*!
     \internal
 
+    Creates directory \a path including all parent directories. Return \c true on
+    success, \c false otherwise.
+
+    On Windows \c QDir::mkpath() doesn't check if the leading directories were created
+    elsewhere (i.e. in another thread) after the initial check that the given path
+    requires creating also parent directories, and returns \c false.
+
+    On Unix platforms this case is handled different by QFileSystemEngine though,
+    which checks for \c EEXIST error code in case any of the recursive directories
+    could not be created.
+
+    Compared to \c QInstaller::mkpath() and \c QDir::mkpath() this function checks if
+    each parent directory to-be-created were created elsewhere.
+*/
+bool QInstaller::createDirectoryWithParents(const QString &path)
+{
+    if (path.isEmpty())
+        return false;
+
+    QFileInfo dirInfo(path);
+    if (dirInfo.exists() && dirInfo.isDir())
+        return true;
+
+    // bail out if we are at the root directory
+    if (dirInfo.isRoot())
+        return false;
+
+    QDir dir(path);
+    if (dir.exists() || dir.mkdir(path))
+        return true;
+
+    // mkdir failed, try to create the parent directory
+    if (!createDirectoryWithParents(dirInfo.absolutePath()))
+        return false;
+
+    // now try again
+    if (dir.exists() || dir.mkdir(path))
+        return true;
+
+    // directory may be have also been created elsewhere
+    return (dirInfo.exists() && dirInfo.isDir());
+}
+
+/*!
+    \internal
+
     Generates and returns a temporary file name. The name can start with
     a template \a templ.
 */
 QString QInstaller::generateTemporaryFileName(const QString &templ)
 {
-    static const QLatin1String staticPart("%1.tmp.XXXXXX");
-
-    QTemporaryFile f;
-    if (!templ.isEmpty())
-        f.setFileTemplate(QString(staticPart).arg(templ));
-
-    if (!f.open()) {
-        if (!templ.isEmpty()) {
-            throw Error(QCoreApplication::translate("QInstaller",
-                "Cannot open temporary file for template %1: %2").arg(templ, f.errorString()));
-        } else {
+    if (templ.isEmpty()) {
+        QTemporaryFile f;
+        if (!f.open()) {
             throw Error(QCoreApplication::translate("QInstaller",
                 "Cannot open temporary file: %1").arg(f.errorString()));
         }
+        return f.fileName();
     }
+
+    static const QString characters = QLatin1String("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890");
+    QString suffix;
+    for (int i = 0; i < 5; ++i)
+        suffix += characters[QRandomGenerator::global()->generate() % characters.length()];
+
+    const QString tmp = QLatin1String("%1.tmp.%2.%3");
+    int count = 1;
+    while (QFile::exists(tmp.arg(templ, suffix).arg(count)))
+        ++count;
+
+    QFile f(tmp.arg(templ, suffix).arg(count));
+    if (!f.open(QIODevice::WriteOnly)) {
+        throw Error(QCoreApplication::translate("QInstaller",
+            "Cannot open temporary file for template %1: %2").arg(templ, f.errorString()));
+    }
+    f.remove();
     return f.fileName();
 }
 
@@ -670,7 +734,7 @@ quint64 QInstaller::fileSize(const QFileInfo &info)
 bool QInstaller::isInBundle(const QString &path, QString *bundlePath)
 {
 #ifdef Q_OS_MACOS
-    QFileInfo fi = QFileInfo(path).absoluteFilePath();
+    QFileInfo fi(QFileInfo(path).absoluteFilePath());
     while (!fi.isRoot()) {
         if (fi.isBundle()) {
             if (bundlePath)
@@ -689,16 +753,24 @@ bool QInstaller::isInBundle(const QString &path, QString *bundlePath)
 /*!
     Replaces the path \a before with the path \a after at the beginning of \a path and returns
     the replaced path. If \a before cannot be found in \a path, the original value is returned.
+    If \a cleanPath is \c true, path is returned with directory separators normalized (that is,
+    platform-native separators converted to "/") and redundant ones removed, and "."s and ".."s
+    resolved (as far as possible). If \a cleanPath is \c false, path is returned as such. Default
+    value is \c true.
 */
-QString QInstaller::replacePath(const QString &path, const QString &before, const QString &after)
+QString QInstaller::replacePath(const QString &path, const QString &before, const QString &after, bool cleanPath)
 {
     if (path.isEmpty() || before.isEmpty())
         return path;
 
     QString pathToPatch = QDir::cleanPath(path);
     const QString pathToReplace = QDir::cleanPath(before);
-    if (pathToPatch.startsWith(pathToReplace))
-        return QDir::cleanPath(after) + pathToPatch.mid(pathToReplace.size());
+    if (pathToPatch.startsWith(pathToReplace)) {
+        if (cleanPath)
+            return QDir::cleanPath(after) + pathToPatch.mid(pathToReplace.size());
+        else
+            return after + path.mid(before.size());
+    }
     return path;
 }
 
@@ -792,8 +864,8 @@ void QInstaller::copyConfigChildElements(QDomDocument &dom, const QDomNodeList &
 
         // Filename may also contain a path relative to source directory but we
         // copy it strictly into target directory without extra paths
-        const QString newName = domElement.text()
-            .replace(QRegExp(QLatin1String("\\\\|/|\\.|:")), QLatin1String("_"));
+        static const QRegularExpression regex(QLatin1String("\\\\|/|\\.|:"));
+        const QString newName = domElement.text().replace(regex, QLatin1String("_"));
 
         const QString targetFile = targetDir + QDir::separator() + newName;
         const QFileInfo elementFileInfo = QFileInfo(sourceDir, domElement.text());