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

QtConcurrent::run crashes on program exit

Browse Source 
When an application is about to be closed and all the
destructors are called, if there isQtConcurrent::run on
the way, it crashes as the internal threadpool pointer
is nullptr.

Fixes: QTBUG-98901
Pick-to: 6.2 6.3
Change-Id: Idd84d1518fc6a225263e6666a0f1de2ccef79c82
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
This commit is contained in:
Tianlu Shao 2021-12-17 10:27:55 +08:00 committed by Sona Kurazyan
parent 43e9f86cc1
commit 87b93c29be
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/concurrent/qtconcurrentrunbase.h
View File

@ -93,7 +93,13 @@ public:
promise.setRunnable(this); promise.setRunnable(this);
promise.reportStarted(); promise.reportStarted();
QFuture<T> theFuture = promise.future(); QFuture<T> theFuture = promise.future();
parameters.threadPool->start(this, parameters.priority);
if (parameters.threadPool) {
parameters.threadPool->start(this, parameters.priority);
} else {
promise.reportCanceled();
promise.reportFinished();
}
return theFuture; return theFuture;
} }

12
tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
View File

@ -65,6 +65,7 @@ private slots:
void crefFunction(); void crefFunction();
void customPromise(); void customPromise();
void nonDefaultConstructibleValue(); void nonDefaultConstructibleValue();
void nullThreadPool();
}; };
void light() void light()
@ -1577,5 +1578,16 @@ void tst_QtConcurrentRun::nonDefaultConstructibleValue()
QCOMPARE(future.result().value, 42); QCOMPARE(future.result().value, 42);
} }
// QTBUG-98901
void tst_QtConcurrentRun::nullThreadPool()
{
QThreadPool *pool = nullptr;
std::atomic<bool> isInvoked = false;
auto future = run(pool, [&] { isInvoked = true; });
future.waitForFinished();
QVERIFY(future.isCanceled());
QVERIFY(!isInvoked);
}
QTEST_MAIN(tst_QtConcurrentRun) QTEST_MAIN(tst_QtConcurrentRun)
#include "tst_qtconcurrentrun.moc" #include "tst_qtconcurrentrun.moc"