Merge pull request #35452 from CeliaFernandez/fix_UBSAN_issue35036_MU…

…O-TSGFromL2Muon Fix undefined behavior in TSGFromL2 from empty pointer
cms-sw · Oct 7, 2021 · 15f50df · 15f50df
2 parents ccb5275 + 157c420
commit 15f50df
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.cc
@@ -90,6 +90,8 @@ void TSGFromL2Muon::produce(edm::Event& ev, const edm::EventSetup& es) {
     std::unique_ptr<RectangularEtaPhiTrackingRegion> region;
     if (theRegionBuilder) {
       region = theRegionBuilder->region(muRef);
+    } else {
+      region = std::make_unique<RectangularEtaPhiTrackingRegion>();
     }
 
     //Make seeds container

diff --git a/RecoTracker/TkTrackingRegions/interface/RectangularEtaPhiTrackingRegion.h b/RecoTracker/TkTrackingRegions/interface/RectangularEtaPhiTrackingRegion.h
@@ -43,6 +43,8 @@ class RectangularEtaPhiTrackingRegion final : public TrackingRegion {
 
   static UseMeasurementTracker stringToUseMeasurementTracker(const std::string& name);
 
+  RectangularEtaPhiTrackingRegion() {}
+
   RectangularEtaPhiTrackingRegion(RectangularEtaPhiTrackingRegion const& rh)
       : TrackingRegion(rh),
         theEtaRange(rh.theEtaRange),

diff --git a/RecoTracker/TkTrackingRegions/interface/TrackingRegion.h b/RecoTracker/TkTrackingRegions/interface/TrackingRegion.h
@@ -46,6 +46,8 @@ class TrackingRegion {
   typedef SeedingLayerSetsHits::Hits Hits;
 
 public:
+  TrackingRegion() {}
+
   TrackingRegion(const GlobalVector& direction,
                  const GlobalPoint& originPos,
                  const Range& invPtRange,