From 9cd199a49ed0e046c8327f81f736f9d7e12714a3 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Tue, 9 Dec 2025 23:31:01 +0200 Subject: [PATCH] fix use-afrer-free crash caused by QtConcurrent Signed-off-by: Trial97 --- launcher/InstanceImportTask.cpp | 1 - launcher/archive/ExportToZipTask.cpp | 30 ++++++++++++++-------------- launcher/archive/ExportToZipTask.h | 24 +++++++++++----------- launcher/archive/ExtractZipTask.cpp | 22 ++++++++++---------- launcher/archive/ExtractZipTask.h | 8 ++++---- 5 files changed, 42 insertions(+), 43 deletions(-) diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp index 554a563a8..17066fd22 100644 --- a/launcher/InstanceImportTask.cpp +++ b/launcher/InstanceImportTask.cpp @@ -121,7 +121,6 @@ QString cleanPath(QString path) void InstanceImportTask::processZipPack() { setStatus(tr("Attempting to determine instance type")); - setDetails(""); QDir extractDir(m_stagingPath); qDebug() << "Attempting to create instance from" << m_archivePath; diff --git a/launcher/archive/ExportToZipTask.cpp b/launcher/archive/ExportToZipTask.cpp index 4886dc963..9df9539be 100644 --- a/launcher/archive/ExportToZipTask.cpp +++ b/launcher/archive/ExportToZipTask.cpp @@ -26,9 +26,9 @@ void ExportToZipTask::executeTask() { setStatus("Adding files..."); setProgress(0, m_files.length()); - m_build_zip_future = QtConcurrent::run(QThreadPool::globalInstance(), [this]() { return exportZip(); }); - connect(&m_build_zip_watcher, &QFutureWatcher::finished, this, &ExportToZipTask::finish); - m_build_zip_watcher.setFuture(m_build_zip_future); + m_buildZipFuture = QtConcurrent::run(QThreadPool::globalInstance(), [this]() { return exportZip(); }); + connect(&m_buildZipWatcher, &QFutureWatcher::finished, this, &ExportToZipTask::finish); + m_buildZipWatcher.setFuture(m_buildZipFuture); } auto ExportToZipTask::exportZip() -> ZipResult @@ -40,30 +40,30 @@ auto ExportToZipTask::exportZip() -> ZipResult return ZipResult(tr("Could not create file")); } - for (auto fileName : m_extra_files.keys()) { - if (m_build_zip_future.isCanceled()) + for (auto fileName : m_extraFiles.keys()) { + if (m_buildZipFuture.isCanceled()) return ZipResult(); - if (!m_output.addFile(fileName, m_extra_files[fileName])) { + if (!m_output.addFile(fileName, m_extraFiles[fileName])) { return ZipResult(tr("Could not add:") + fileName); } } for (const QFileInfo& file : m_files) { - if (m_build_zip_future.isCanceled()) + if (m_buildZipFuture.isCanceled()) return ZipResult(); auto absolute = file.absoluteFilePath(); auto relative = m_dir.relativeFilePath(absolute); setStatus("Compressing: " + relative); setProgress(m_progress + 1, m_progressTotal); - if (m_follow_symlinks) { + if (m_followSymlinks) { if (file.isSymLink()) absolute = file.symLinkTarget(); else absolute = file.canonicalFilePath(); } - if (!m_exclude_files.contains(relative) && !m_output.addFile(absolute, m_destination_prefix + relative)) { + if (!m_excludeFiles.contains(relative) && !m_output.addFile(absolute, m_destinationPrefix + relative)) { return ZipResult(tr("Could not read and compress %1").arg(relative)); } } @@ -76,11 +76,11 @@ auto ExportToZipTask::exportZip() -> ZipResult void ExportToZipTask::finish() { - if (m_build_zip_future.isCanceled()) { - FS::deletePath(m_output_path); + if (m_buildZipFuture.isCanceled()) { + FS::deletePath(m_outputPath); emitAborted(); - } else if (auto result = m_build_zip_future.result(); result.has_value()) { - FS::deletePath(m_output_path); + } else if (auto result = m_buildZipFuture.result(); result.has_value()) { + FS::deletePath(m_outputPath); emitFailed(result.value()); } else { emitSucceeded(); @@ -89,8 +89,8 @@ void ExportToZipTask::finish() bool ExportToZipTask::abort() { - if (m_build_zip_future.isRunning()) { - m_build_zip_future.cancel(); + if (m_buildZipFuture.isRunning()) { + m_buildZipFuture.cancel(); // NOTE: Here we don't do `emitAborted()` because it will be done when `m_build_zip_future` actually cancels, which may not occur // immediately. return true; diff --git a/launcher/archive/ExportToZipTask.h b/launcher/archive/ExportToZipTask.h index 2e0a8273e..21ad1db48 100644 --- a/launcher/archive/ExportToZipTask.h +++ b/launcher/archive/ExportToZipTask.h @@ -30,12 +30,12 @@ class ExportToZipTask : public Task { Q_OBJECT public: ExportToZipTask(QString outputPath, QDir dir, QFileInfoList files, QString destinationPrefix = "", bool followSymlinks = false) - : m_output_path(outputPath) + : m_outputPath(outputPath) , m_output(outputPath) , m_dir(dir) , m_files(files) - , m_destination_prefix(destinationPrefix) - , m_follow_symlinks(followSymlinks) + , m_destinationPrefix(destinationPrefix) + , m_followSymlinks(followSymlinks) { setAbortable(true); }; @@ -44,8 +44,8 @@ class ExportToZipTask : public Task { virtual ~ExportToZipTask() = default; - void setExcludeFiles(QStringList excludeFiles) { m_exclude_files = excludeFiles; } - void addExtraFile(QString fileName, QByteArray data) { m_extra_files.insert(fileName, data); } + void setExcludeFiles(QStringList excludeFiles) { m_excludeFiles = excludeFiles; } + void addExtraFile(QString fileName, QByteArray data) { m_extraFiles.insert(fileName, data); } using ZipResult = std::optional; @@ -57,16 +57,16 @@ class ExportToZipTask : public Task { void finish(); private: - QString m_output_path; + QString m_outputPath; ArchiveWriter m_output; QDir m_dir; QFileInfoList m_files; - QString m_destination_prefix; - bool m_follow_symlinks; - QStringList m_exclude_files; - QHash m_extra_files; + QString m_destinationPrefix; + bool m_followSymlinks; + QStringList m_excludeFiles; + QHash m_extraFiles; - QFuture m_build_zip_future; - QFutureWatcher m_build_zip_watcher; + QFuture m_buildZipFuture; + QFutureWatcher m_buildZipWatcher; }; } // namespace MMCZip \ No newline at end of file diff --git a/launcher/archive/ExtractZipTask.cpp b/launcher/archive/ExtractZipTask.cpp index 7dd002017..b958640c9 100644 --- a/launcher/archive/ExtractZipTask.cpp +++ b/launcher/archive/ExtractZipTask.cpp @@ -25,14 +25,14 @@ namespace MMCZip { void ExtractZipTask::executeTask() { - m_zip_future = QtConcurrent::run(QThreadPool::globalInstance(), [this]() { return extractZip(); }); - connect(&m_zip_watcher, &QFutureWatcher::finished, this, &ExtractZipTask::finish); - m_zip_watcher.setFuture(m_zip_future); + m_zipFuture = QtConcurrent::run(QThreadPool::globalInstance(), [this]() { return extractZip(); }); + connect(&m_zipWatcher, &QFutureWatcher::finished, this, &ExtractZipTask::finish); + m_zipWatcher.setFuture(m_zipFuture); } auto ExtractZipTask::extractZip() -> ZipResult { - auto target = m_output_dir.absolutePath(); + auto target = m_outputDir.absolutePath(); auto target_top_dir = QUrl::fromLocalFile(target); QStringList extracted; @@ -52,8 +52,9 @@ auto ExtractZipTask::extractZip() -> ZipResult setStatus("Extracting files..."); setProgress(0, m_input.getFiles().count()); ZipResult result; + auto fileName = m_input.getZipName(); if (!m_input.parse([this, &result, &target, &target_top_dir, ext, &extracted](ArchiveReader::File* f) { - if (m_zip_future.isCanceled()) + if (m_zipFuture.isCanceled()) return false; setProgress(m_progress + 1, m_progressTotal); QString file_name = f->filename(); @@ -104,17 +105,16 @@ auto ExtractZipTask::extractZip() -> ZipResult return true; })) { FS::removeFiles(extracted); - return result.has_value() || m_zip_future.isCanceled() ? result - : ZipResult(tr("Failed to parse file %1").arg(m_input.getZipName())); + return result.has_value() ? result : ZipResult(tr("Failed to parse file %1").arg(fileName)); } return ZipResult(); } void ExtractZipTask::finish() { - if (m_zip_future.isCanceled()) { + if (m_zipFuture.isCanceled()) { emitAborted(); - } else if (auto result = m_zip_future.result(); result.has_value()) { + } else if (auto result = m_zipFuture.result(); result.has_value()) { emitFailed(result.value()); } else { emitSucceeded(); @@ -123,8 +123,8 @@ void ExtractZipTask::finish() bool ExtractZipTask::abort() { - if (m_zip_future.isRunning()) { - m_zip_future.cancel(); + if (m_zipFuture.isRunning()) { + m_zipFuture.cancel(); // NOTE: Here we don't do `emitAborted()` because it will be done when `m_build_zip_future` actually cancels, which may not occur // immediately. return true; diff --git a/launcher/archive/ExtractZipTask.h b/launcher/archive/ExtractZipTask.h index a9ad0a548..284d873fe 100644 --- a/launcher/archive/ExtractZipTask.h +++ b/launcher/archive/ExtractZipTask.h @@ -29,7 +29,7 @@ class ExtractZipTask : public Task { Q_OBJECT public: ExtractZipTask(QString input, QDir outputDir, QString subdirectory = "") - : m_input(input), m_output_dir(outputDir), m_subdirectory(subdirectory) + : m_input(input), m_outputDir(outputDir), m_subdirectory(subdirectory) {} virtual ~ExtractZipTask() = default; @@ -44,10 +44,10 @@ class ExtractZipTask : public Task { private: ArchiveReader m_input; - QDir m_output_dir; + QDir m_outputDir; QString m_subdirectory; - QFuture m_zip_future; - QFutureWatcher m_zip_watcher; + QFuture m_zipFuture; + QFutureWatcher m_zipWatcher; }; } // namespace MMCZip \ No newline at end of file