Merge pull request #1187 from JeffersonLab/aaust_analysis_loop_safe

Safe-guard against int wrap-around
JeffersonLab · Jul 27, 2018 · cd248aa · cd248aa
2 parents c0aeeb0 + 09450e5
commit cd248aa
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/libraries/ANALYSIS/DSourceComboer.cc b/src/libraries/ANALYSIS/DSourceComboer.cc
@@ -1690,6 +1690,9 @@ void DSourceComboer::Combo_WithBeam(const vector<const DReaction*>& locReactions
 	}
 
 	//Select beam particles
+	if (abs(locRFBunch) > 2000000000)
+	  return; // proximity to INT_MAX can cause infinite loops, certainly no valid beam particle
+
 	auto locBeamParticles = dSourceComboTimeHandler->Get_BeamParticlesByRFBunch(locRFBunch, dMaxRFBunchCuts[locReactionVertexInfo]);
 	if(dDebugLevel > 0)
 		cout << "rf bunch, max #rf bunches, #beams = " << locRFBunch << ", " << dMaxRFBunchCuts[locReactionVertexInfo] << ", " << locBeamParticles.size() << endl;