1 files changed, 25 insertions, 3 deletions
diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
index 94248404da..3e3165013f 100644
--- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 #include <qtconcurrentmap.h>
 #include <qexception.h>
 #include <qdebug.h>
@@ -185,6 +185,17 @@ void tst_QtConcurrentMap::map()
         QCOMPARE(list, NonTemplateSequence({ 2, 4, 6 }));
     }
 
+    // custom pool with invalid number of threads
+    {
+        QList<int> list;
+        list << 1 << 2 << 3;
+        QThreadPool pool;
+        pool.setMaxThreadCount(0); // explicitly set incorrect value
+        // This should not crash
+        QtConcurrent::map(&pool, list, MultiplyBy2InPlace()).waitForFinished();
+        QCOMPARE(list, QList<int>() << 2 << 4 << 6);
+    }
+
 #if 0
     // not allowed: map() with immutable sequences makes no sense
     {
@@ -215,7 +226,7 @@ void tst_QtConcurrentMap::map()
 #if 0
     // not allowed: map() on a const list, where functors try to modify the items in the list
     {
-        const QList<int> list = QList<int>() << 1 << 2 << 3;;
+        const QList<int> list = QList<int>() << 1 << 2 << 3;
 
         QtConcurrent::map(list, MultiplyBy2InPlace());
         QtConcurrent::map(list, multiplyBy2InPlace);
@@ -352,7 +363,7 @@ void tst_QtConcurrentMap::blockingMap()
 #if 0
     // not allowed: map() on a const list, where functors try to modify the items in the list
     {
-        const QList<int> list = QList<int>() << 1 << 2 << 3;;
+        const QList<int> list = QList<int>() << 1 << 2 << 3;
 
         QtConcurrent::blockingMap(list, MultiplyBy2InPlace());
         QtConcurrent::blockingMap(list, multiplyBy2InPlace);
@@ -1075,6 +1086,17 @@ void tst_QtConcurrentMap::mappedReducedThreadPool()
                                                           intCube, intSumReduce);
         QCOMPARE(result, sumOfCubes);
     }
+
+    {
+        // pool with invalid number of threads
+        QThreadPool pool;
+        pool.setMaxThreadCount(0); // explicitly set incorrect value
+
+        // This should not crash
+        NonTemplateSequence list { 1, 2, 3 };
+        auto future = QtConcurrent::mappedReduced(&pool, list, multiplyBy2, intSumReduce);
+        QCOMPARE(future.result(), 12);
+    }
 }
 
 void tst_QtConcurrentMap::mappedReducedWithMoveOnlyCallable()