summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2022-12-26 21:02:45 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-01-06 16:40:35 +0000
commit34ac00a072ff98605483b0790c510cfbbed4f894 (patch)
treeffacd5d8bb67b96977dccdaefb5107d993395f66 /tests
parentb5164f0fdfe80e4369fb6a071f0f82f472fd27d5 (diff)
Fix crash when cancelling a QFuture that has continuation with context
To support cancellation of continuations attached via the parent future, we store a pointer to continuation future's data in parent. This requires preserving the lifetime of continuation future's data while the parent is still alive (see 24dedaeaa1a94bfe9ade2da2a2c9aa112241b07a). This is achieved by capturing the promise in the continuation's lambda, which is only cleaned up after the parent's data is destroyed. This is already the case for continuations without context, but was overlooked for continuations with context: they transfer the ownership of the continuation promise to lambda passed to QMetaObject::invokeMethod(), which destroys the lambda's context after it's run. As a result, the continuation's promise (and data, if there are no other copies of it) is also destroyed, leaving the parent pointing to deleted continuation data. To fix this, capture a copy of continuation future's ref-counted data in the continuation's lambda. This will guarantee that the continuation data remains alive until the parent is destroyed and the continuation is cleaned up. Fixes: QTBUG-108790 Change-Id: Ief4b37f31e652988d13b03499505ac65c7889226 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 9e61cc4f72a4fe86fa97f64238f1e3d940a7746b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/thread/qfuture/tst_qfuture.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
index 603d2eb21a..e6d5a9b6f9 100644
--- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
@@ -3104,6 +3104,15 @@ void tst_QFuture::cancelContinuations()
QVERIFY(watcher2.isFinished());
QVERIFY(watcher2.isCanceled());
}
+
+ // Cancel continuations with context (QTBUG-108790)
+ {
+ // This test should pass with ASan
+ auto future = QtConcurrent::run([] {});
+ future.then(this, [] {});
+ future.waitForFinished();
+ future.cancel();
+ }
}
void tst_QFuture::continuationsWithContext()