mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix use-afrer-free crash caused by QtConcurrent

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-12-09 23:31:01 +02:00
parent 808b09c403
commit 9cd199a49e
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
5 changed files with 42 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

24
launcher/archive/ExportToZipTask.h
View file

@ -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<QString>;
@ -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<QString, QByteArray> m_extra_files;
QString m_destinationPrefix;
bool m_followSymlinks;
QStringList m_excludeFiles;
QHash<QString, QByteArray> m_extraFiles;
QFuture<ZipResult> m_build_zip_future;
QFutureWatcher<ZipResult> m_build_zip_watcher;
QFuture<ZipResult> m_buildZipFuture;
QFutureWatcher<ZipResult> m_buildZipWatcher;
};
} // namespace MMCZip