check bounding volumes for validity in concurrent reduction step

The multithreaded job doesn't check the visited bounding volumes for
validity before adding them to the list to process further. This leads
to crashes, namely nullptr-dereferences.

Fixes: QTBUG-108405
Pick-to: 6.4
Change-Id: I16a7c008c7ac4f04be40bdbba05d8c745c1c825e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/core/jobs/calcboundingvolumejob.cpp b/src/core/jobs/calcboundingvolumejob.cpp
index d5ea36582..5fab373b3 100644
--- a/src/core/jobs/calcboundingvolumejob.cpp
+++ b/src/core/jobs/calcboundingvolumejob.cpp
@@ -140,9 +140,11 @@ struct ReduceUpdateBoundFunctor
 {
     void operator ()(std::vector<BoundingVolumeComputeResult> &result, const std::vector<BoundingVolumeComputeResult> &values)
     {
-        result.insert(result.end(),
-                      std::make_move_iterator(values.begin()),
-                      std::make_move_iterator(values.end()));
+        for (const auto &value : values) {
+            if (value.valid()) {
+                result.push_back(value);
+            }
+        }
     }
 };