Merge pull request #40086 from swagata87/125X_GsfSmoother

[125X] Improve unprotected areas of GSF code to avoid segfault
cms-sw · Nov 17, 2022 · 2e1911f · 2e1911f
2 parents 3f6d8f9 + 3737b55
commit 2e1911f
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/TrackingTools/GsfTracking/src/GsfTrajectorySmoother.cc b/TrackingTools/GsfTracking/src/GsfTrajectorySmoother.cc
@@ -129,6 +129,10 @@ Trajectory GsfTrajectorySmoother::trajectory(const Trajectory& aTraj) const {
     if (theMerger)
       predTsos = theMerger->merge(predTsos);
 
+    if (!predTsos.isValid()) {
+      return Trajectory();
+    }
+
     if ((*itm).recHit()->isValid()) {
       //update
       currTsos = updator()->update(predTsos, *(*itm).recHit());
@@ -204,6 +208,9 @@ Trajectory GsfTrajectorySmoother::trajectory(const Trajectory& aTraj) const {
     if (theMerger)
       currTsos = theMerger->merge(currTsos);
 
+    if (!currTsos.isValid()) {
+      return Trajectory();
+    }
     dump(currTsos, "currTsos", "GsfTrackFitters");
   }