Merge pull request #12678 from slava77/CMSSW_8_0_X_2015-11-30-1100/si…

…gn645/ubsan11763-SHP initialize isYokeVol in SteppingHelix state constructor
cms-sw · Dec 8, 2015 · 5c9d0a8 · 5c9d0a8
2 parents 1a5e3dd + 5cad97e
commit 5c9d0a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/TrackPropagation/SteppingHelixPropagator/interface/SteppingHelixStateInfo.h b/TrackPropagation/SteppingHelixPropagator/interface/SteppingHelixStateInfo.h
@@ -50,7 +50,7 @@ class SteppingHelixStateInfo {
   static const std::string ResultName[MAX_RESULT];
 
   SteppingHelixStateInfo(): 
-    path_(0), radPath_(0), dir(0), magVol(0), field(0), dEdx(0), dEdXPrime(0), radX0(1e12),
+    path_(0), radPath_(0), dir(0), magVol(0), isYokeVol(false), field(0), dEdx(0), dEdXPrime(0), radX0(1e12),
     isComplete(0), isValid_(0), hasErrorPropagated_(0), status_(UNDEFINED) {}
   SteppingHelixStateInfo(const FreeTrajectoryState& fts);
 

diff --git a/TrackPropagation/SteppingHelixPropagator/src/SteppingHelixStateInfo.cc b/TrackPropagation/SteppingHelixPropagator/src/SteppingHelixStateInfo.cc
@@ -31,7 +31,7 @@ const std::string SteppingHelixStateInfo::ResultName[MAX_RESULT] = {
 };
 
 SteppingHelixStateInfo::SteppingHelixStateInfo(const FreeTrajectoryState& fts): 
-  path_(0), radPath_(0), dir(0), magVol(0), field(0), dEdx(0), dEdXPrime(0), radX0(1e12),
+  path_(0), radPath_(0), dir(0), magVol(0), isYokeVol(false), field(0), dEdx(0), dEdXPrime(0), radX0(1e12),
   status_(UNDEFINED)
 {
   p3.set(fts.momentum().x(), fts.momentum().y(), fts.momentum().z());