1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix potential race condition in QtConcurrent blocking methods

Browse Source 
QtConcurrent::blocking*() methods are using the ExceptionStore directly,
which is not thread safe. In case if there's an exception thrown from
multiple threads there may be a race condition. Added a lock to avoid
that.

Change-Id: I5de9928f91f5f43951b9bf9c4594694dc0ca0328
Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Sona Kurazyan 2020-04-02 10:33:49 +02:00
parent 6a6482cb8d
commit 1812830ac3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/concurrent/qtconcurrentthreadengine.cpp
View File

@ -322,10 +322,13 @@ void ThreadEngineBase::run() // implements QRunnable.
void ThreadEngineBase::handleException(const QException &exception) void ThreadEngineBase::handleException(const QException &exception)
{ {
if (futureInterface) if (futureInterface) {
futureInterface->reportException(exception); futureInterface->reportException(exception);
else if (!exceptionStore.hasException()) } else {
QMutexLocker lock(&mutex);
if (!exceptionStore.hasException())
exceptionStore.setException(exception); exceptionStore.setException(exception);
}
} }
#endif #endif

1
src/concurrent/qtconcurrentthreadengine.h
View File

@ -121,6 +121,7 @@ protected:
QThreadPool *threadPool; QThreadPool *threadPool;
ThreadEngineBarrier barrier; ThreadEngineBarrier barrier;
QtPrivate::ExceptionStore exceptionStore; QtPrivate::ExceptionStore exceptionStore;
QBasicMutex mutex;
}; };