Merge pull request #44281 from slava77/patch-125

add non-empty checks in DAClusterizer to avoid reading null refs
cms-sw · Mar 7, 2024 · ff51428 · ff51428
2 parents 2910a78 + f2c0197
commit ff51428
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/RecoVertex/PrimaryVertexProducer/src/DAClusterizerInZT_vect.cc b/RecoVertex/PrimaryVertexProducer/src/DAClusterizerInZT_vect.cc
@@ -262,8 +262,12 @@ DAClusterizerInZT_vect::track_t DAClusterizerInZT_vect::fill(const vector<reco::
     sumtkwt += t_tkwt;
   }
 
-  tks.extractRaw();
-  tks.osumtkwt = sumtkwt > 0 ? 1. / sumtkwt : 0.;
+  if (sumtkwt > 0) {
+    tks.extractRaw();
+    tks.osumtkwt = 1. / sumtkwt;
+  } else {
+    tks.osumtkwt = 0.;
+  }
 
 #ifdef DEBUG
   if (DEBUGLEVEL > 0) {
@@ -1109,15 +1113,14 @@ bool DAClusterizerInZT_vect::split(const double beta, track_t& tks, vertex_t& y,
 
 vector<TransientVertex> DAClusterizerInZT_vect::vertices(const vector<reco::TransientTrack>& tracks) const {
   track_t&& tks = fill(tracks);
+  vector<TransientVertex> clusters;
+  if (tks.getSize() == 0)
+    return clusters;
   tks.extractRaw();
 
   unsigned int nt = tks.getSize();
   double rho0 = 0.0;  // start with no outlier rejection
 
-  vector<TransientVertex> clusters;
-  if (tks.getSize() == 0)
-    return clusters;
-
   vertex_t y;  // the vertex prototypes
 
   // initialize:single vertex at infinite temperature

diff --git a/RecoVertex/PrimaryVertexProducer/src/DAClusterizerInZ_vect.cc b/RecoVertex/PrimaryVertexProducer/src/DAClusterizerInZ_vect.cc
@@ -208,8 +208,12 @@ DAClusterizerInZ_vect::track_t DAClusterizerInZ_vect::fill(const vector<reco::Tr
     sumtkwt += t_tkwt;
   }
 
-  tks.extractRaw();
-  tks.osumtkwt = sumtkwt > 0 ? 1. / sumtkwt : 0.;
+  if (sumtkwt > 0) {
+    tks.extractRaw();
+    tks.osumtkwt = 1. / sumtkwt;
+  } else {
+    tks.osumtkwt = 0.;
+  }
 
 #ifdef DEBUG
   if (DEBUGLEVEL > 0) {
@@ -768,13 +772,12 @@ bool DAClusterizerInZ_vect::split(const double beta, track_t& tks, vertex_t& y,
 
 vector<TransientVertex> DAClusterizerInZ_vect::vertices_no_blocks(const vector<reco::TransientTrack>& tracks) const {
   track_t&& tks = fill(tracks);
-  tks.extractRaw();
-
-  double rho0 = 0.0;  // start with no outlier rejection
-
   vector<TransientVertex> clusters;
   if (tks.getSize() == 0)
     return clusters;
+  tks.extractRaw();
+
+  double rho0 = 0.0;  // start with no outlier rejection
 
   vertex_t y;  // the vertex prototypes