From 606da14d2f96739b23297e566bff827664374df5 Mon Sep 17 00:00:00 2001
From: Neil Vaytet <neil.vaytet@esss.se>
Date: Mon, 15 Oct 2018 16:39:02 +0200
Subject: [PATCH] Refs #23238 : Missing check for sizes in DetectorInfo merge
---
Framework/Beamline/src/DetectorInfo.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/Framework/Beamline/src/DetectorInfo.cpp b/Framework/Beamline/src/DetectorInfo.cpp
index 4272744abb1..8651a3b68c1 100644
--- a/Framework/Beamline/src/DetectorInfo.cpp
+++ b/Framework/Beamline/src/DetectorInfo.cpp
@@ -171,6 +171,7 @@ void failMerge(const std::string &what) {
* ignored, i.e., no time index is added. */
void DetectorInfo::merge(const DetectorInfo &other,
const std::vector<bool> &merge) {
+ checkSizes(other);
for (size_t timeIndex = 0; timeIndex < other.scanCount(); ++timeIndex) {
if (!merge[timeIndex])
continue;
--
GitLab