1 files changed, 37 insertions, 0 deletions
diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
index a4eb2936b5..7bba0b710b 100644
--- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -30,6 +30,8 @@
 #include <QString>
 #include <QtTest/QtTest>
 
+#include <atomic>
+
 using namespace QtConcurrent;
 
 class tst_QtConcurrentRun: public QObject
@@ -50,6 +52,8 @@ private slots:
 #endif
     void functor();
     void lambda();
+    void nullThreadPool();
+    void nullThreadPoolNoLeak();
 };
 
 void light()
@@ -732,5 +736,38 @@ void tst_QtConcurrentRun::lambda()
     }
 }
 
+// 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);
+}
+
+struct LifetimeChecker
+{
+    LifetimeChecker() { ++count; }
+    LifetimeChecker(const LifetimeChecker &) { ++count; }
+    ~LifetimeChecker() { --count; }
+
+    void operator()() { }
+
+    static std::atomic<int> count;
+};
+std::atomic<int> LifetimeChecker::count{ 0 };
+
+void tst_QtConcurrentRun::nullThreadPoolNoLeak()
+{
+    {
+        QThreadPool *pool = nullptr;
+        auto future = run(pool, LifetimeChecker());
+        future.waitForFinished();
+    }
+    QCOMPARE(LifetimeChecker::count, 0);
+}
+
 QTEST_MAIN(tst_QtConcurrentRun)
 #include "tst_qtconcurrentrun.moc"