squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-18 06:28:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Call QPromise::start() early to avoid race condition

Browse Source 
PR #22617.
This commit is contained in:
Vladimir Golovnev
2025-04-28 17:26:51 +03:00
committed by sledgehammer999
parent ad4bdc0653
commit c2f2a38582
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/base/bittorrent/filesearcher.cpp
View File

@@ -63,10 +63,8 @@ namespace
} }
void FileSearcher::search(const PathList &originalFileNames, const Path &savePath void FileSearcher::search(const PathList &originalFileNames, const Path &savePath
, const Path &downloadPath, const bool forceAppendExt, QPromise<FileSearchResult> promise) , const Path &downloadPath, const bool forceAppendExt, QPromise<FileSearchResult> &promise)
{ {
promise.start();
Path usedPath = savePath; Path usedPath = savePath;
PathList adjustedFileNames = originalFileNames; PathList adjustedFileNames = originalFileNames;
const bool found = findInDir(usedPath, adjustedFileNames, (forceAppendExt && downloadPath.isEmpty())); const bool found = findInDir(usedPath, adjustedFileNames, (forceAppendExt && downloadPath.isEmpty()));
@@ -77,5 +75,4 @@ void FileSearcher::search(const PathList &originalFileNames, const Path &savePat
} }
promise.addResult(FileSearchResult {.savePath = usedPath, .fileNames = adjustedFileNames}); promise.addResult(FileSearchResult {.savePath = usedPath, .fileNames = adjustedFileNames});
promise.finish();
} }

2
src/base/bittorrent/filesearcher.h
View File

@@ -49,5 +49,5 @@ public:
using QObject::QObject; using QObject::QObject;
void search(const PathList &originalFileNames, const Path &savePath void search(const PathList &originalFileNames, const Path &savePath
, const Path &downloadPath, bool forceAppendExt, QPromise<FileSearchResult> promise); , const Path &downloadPath, bool forceAppendExt, QPromise<FileSearchResult> &promise);
}; };

4
src/base/bittorrent/sessionimpl.cpp
View File

@@ -3008,9 +3008,11 @@ QFuture<FileSearchResult> SessionImpl::findIncompleteFiles(const Path &savePath,
{ {
QPromise<FileSearchResult> promise; QPromise<FileSearchResult> promise;
QFuture<FileSearchResult> future = promise.future(); QFuture<FileSearchResult> future = promise.future();
promise.start();
QMetaObject::invokeMethod(m_fileSearcher, [=, this, promise = std::move(promise)]() mutable QMetaObject::invokeMethod(m_fileSearcher, [=, this, promise = std::move(promise)]() mutable
{ {
m_fileSearcher->search(filePaths, savePath, downloadPath, isAppendExtensionEnabled(), std::move(promise)); m_fileSearcher->search(filePaths, savePath, downloadPath, isAppendExtensionEnabled(), promise);
promise.finish();
}); });
return future; return future;

2
src/base/bittorrent/torrentimpl.cpp
View File

@@ -3055,9 +3055,9 @@ QFuture<std::invoke_result_t<Func>> TorrentImpl::invokeAsync(Func &&func) const
{ {
QPromise<std::invoke_result_t<Func>> promise; QPromise<std::invoke_result_t<Func>> promise;
const auto future = promise.future(); const auto future = promise.future();
promise.start();
m_session->invokeAsync([func = std::forward<Func>(func), promise = std::move(promise)]() mutable m_session->invokeAsync([func = std::forward<Func>(func), promise = std::move(promise)]() mutable
{ {
promise.start();
promise.addResult(func()); promise.addResult(func());
promise.finish(); promise.finish();
}); });