Merge pull request #36802 from Dr15Jones/ubsanGeneratorInterfaceCore

Fix calling methods on nullptr in Concurrent*Filter modules
cms-sw · Jan 26, 2022 · 70c9065 · 70c9065
2 parents ec200b2 + a4e0ad9
commit 70c9065
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/GeneratorInterface/Core/interface/ConcurrentGeneratorFilter.h b/GeneratorInterface/Core/interface/ConcurrentGeneratorFilter.h
@@ -174,10 +174,16 @@ namespace edm {
     Service<RandomNumberGenerator> rng;
     auto enginePtr = rng->cloneEngine(lumi.index());
     cache->hadronizer_.setRandomEngine(enginePtr.get());
-    cache->decayer_->setRandomEngine(enginePtr.get());
+    if (cache->decayer_) {
+      cache->decayer_->setRandomEngine(enginePtr.get());
+    }
 
     auto unsetH = [](HAD* h) { h->setRandomEngine(nullptr); };
-    auto unsetD = [](DEC* d) { d->setRandomEngine(nullptr); };
+    auto unsetD = [](DEC* d) {
+      if (d) {
+        d->setRandomEngine(nullptr);
+      }
+    };
 
     std::unique_ptr<HAD, decltype(unsetH)> randomEngineSentry(&cache->hadronizer_, unsetH);
     std::unique_ptr<DEC, decltype(unsetD)> randomEngineSentryDecay(cache->decayer_.get(), unsetD);

diff --git a/GeneratorInterface/Core/interface/ConcurrentHadronizerFilter.h b/GeneratorInterface/Core/interface/ConcurrentHadronizerFilter.h
@@ -400,10 +400,16 @@ namespace edm {
     Service<RandomNumberGenerator> rng;
     auto enginePtr = rng->cloneEngine(lumi.index());
     cache->hadronizer_.setRandomEngine(enginePtr.get());
-    cache->decayer_->setRandomEngine(enginePtr.get());
+    if (cache->decayer_) {
+      cache->decayer_->setRandomEngine(enginePtr.get());
+    }
 
     auto unsetH = [](HAD* h) { h->setRandomEngine(nullptr); };
-    auto unsetD = [](DEC* d) { d->setRandomEngine(nullptr); };
+    auto unsetD = [](DEC* d) {
+      if (d) {
+        d->setRandomEngine(nullptr);
+      }
+    };
 
     std::unique_ptr<HAD, decltype(unsetH)> randomEngineSentry(&cache->hadronizer_, unsetH);
     std::unique_ptr<DEC, decltype(unsetD)> randomEngineSentryDecay(cache->decayer_.get(), unsetD);