diff options
| author | David Faure <david.faure@kdab.com> | 2015-08-01 15:50:00 +0200 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2015-09-22 07:55:03 +0000 |
| commit | ec6556a2b99df373eb43ca009340a7f0f19bacbd (patch) | |
| tree | 8bdcbf73f4d66a7d86d6c6afdfa93708b9ec34f7 /src/corelib/thread/qthread_p.h | |
| parent | 71df75966db5f51c66bff1c436dd1cb5a895b51b (diff) | |
Fix two data races in QThread/QThreadData
* theMainThread is written by the main thread and read by
QThreadData::~QThreadData() (any managed thread)
* QThreadData::thread is written by QThread::~QThread (in the parent thread)
and read+written by QThreadData::~QThreadData (in the managed thread).
This can happen because QThreadData is refcounted so the managed
thread (which derefs it) races with the parent thread (which sets it to 0).
Change-Id: I72de793716391a0937254cda6b4328fcad5060c7
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/thread/qthread_p.h')
| -rw-r--r-- | src/corelib/thread/qthread_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index 1ecd682ad1..8331816729 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -269,7 +269,7 @@ public: QStack<QEventLoop *> eventLoops; QPostEventList postEventList; - QThread *thread; + QAtomicPointer<QThread> thread; Qt::HANDLE threadId; QAtomicPointer<QAbstractEventDispatcher> eventDispatcher; QVector<void *> tls; |