Merge pull request #39471 from laurenhay/UBSAN_SimpleJetCorrector

Fix for UBSAN runtime error in CondFormats/JetMETObjects/src/SimpleJetCorrector.cc
cms-sw · Sep 27, 2022 · 185fd98 · 185fd98
2 parents 00ec235 + 6f1b16e
commit 185fd98
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/CondFormats/JetMETObjects/src/SimpleJetCorrector.cc b/CondFormats/JetMETObjects/src/SimpleJetCorrector.cc
@@ -4,6 +4,7 @@
 #include <iostream>
 #include <sstream>
 #include <cmath>
+#include <algorithm>
 
 //------------------------------------------------------------------------
 //--- SimpleJetCorrector constructor -------------------------------------
@@ -78,25 +79,30 @@ float SimpleJetCorrector::correctionBin(unsigned fBin, const std::vector<float>&
     handleError("SimpleJetCorrector", sserr.str());
   }
   unsigned N = fY.size();
-  if (N > 4) {
-    std::stringstream sserr;
-    sserr << "two many variables: " << N << " maximum is 4";
-    handleError("SimpleJetCorrector", sserr.str());
-  }
-  const std::vector<float>& par = mParameters.record(fBin).parameters();
-
-  double params[par.size() - 2 * N];
-  for (unsigned int i = 2 * N; i < par.size(); i++) {
-    params[i - 2 * N] = par[i];
-  }
-  double x[4] = {};
-  for (unsigned i = 0; i < N; i++) {
-    x[i] = (fY[i] < par[2 * i]) ? par[2 * i] : (fY[i] > par[2 * i + 1]) ? par[2 * i + 1] : fY[i];
-  }
-  if (mParameters.definitions().isResponse()) {
-    return invert(x, params);
+  if (!fY.empty() && N <= 4) {
+    const std::vector<float>& par = mParameters.record(fBin).parameters();
+    auto nParams = static_cast<int>(par.size() - 2 * N);
+    if (nParams > 0) {
+      double params[nParams];
+      for (unsigned int i = 2 * N; i < par.size(); i++) {
+        params[i - 2 * N] = par[i];
+      }
+      double x[4] = {};
+      for (unsigned i = 0; i < N; i++) {
+        x[i] = (fY[i] < par[2 * i]) ? par[2 * i] : (fY[i] > par[2 * i + 1]) ? par[2 * i + 1] : fY[i];
+      }
+      if (mParameters.definitions().isResponse()) {
+        return invert(x, params);
+      }
+      return mFunc.evaluate(reco::formula::ArrayAdaptor(x, N), reco::formula::ArrayAdaptor(params, par.size() - 2 * N));
+    } else {
+      return 1.0;
+    }
+  } else {
+    edm::LogWarning("SimpleJetCorrector") << "Expect number of variables to be 0<N<=4 but is " << N << "in bin " << fBin
+                                          << ". Returning zero" << std::endl;
+    return 0.0;
   }
-  return mFunc.evaluate(reco::formula::ArrayAdaptor(x, N), reco::formula::ArrayAdaptor(params, par.size() - 2 * N));
 }
 //------------------------------------------------------------------------
 //--- find invertion variable (JetPt) ------------------------------------