Skip to content
Snippets Groups Projects
Commit 606da14d authored by Neil Vaytet's avatar Neil Vaytet
Browse files

Refs #23238 : Missing check for sizes in DetectorInfo merge

parent a5ccba98
No related branches found
No related tags found
No related merge requests found
...@@ -171,6 +171,7 @@ void failMerge(const std::string &what) { ...@@ -171,6 +171,7 @@ void failMerge(const std::string &what) {
* ignored, i.e., no time index is added. */ * ignored, i.e., no time index is added. */
void DetectorInfo::merge(const DetectorInfo &other, void DetectorInfo::merge(const DetectorInfo &other,
const std::vector<bool> &merge) { const std::vector<bool> &merge) {
checkSizes(other);
for (size_t timeIndex = 0; timeIndex < other.scanCount(); ++timeIndex) { for (size_t timeIndex = 0; timeIndex < other.scanCount(); ++timeIndex) {
if (!merge[timeIndex]) if (!merge[timeIndex])
continue; continue;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment