Merge pull request #45581 from omiguelc/emtfp2_loop_fix_for_14_1_0_pre6

cmsbuild · web-flow · commit 0881c5bee960 · 2024-08-03T15:40:04.000+02:00
hotfix for array out of bounds
diff --git a/L1Trigger/L1TMuonEndCapPhase2/src/Algo/RoadSortingLayer.cc b/L1Trigger/L1TMuonEndCapPhase2/src/Algo/RoadSortingLayer.cc
@@ -97,7 +97,7 @@ void RoadSortingLayer::apply(const unsigned int& first_n,
         roads_kept, 32, 16, [](const road_t& lhs, const road_t& rhs) -> int { return lhs.quality < rhs.quality; });
 
     // Shift everything 16 cols to the left
-    for (unsigned int i = 16; i < keep_n_roads; ++i) {
+    for (unsigned int i = 16; i < (keep_n_roads - 16); ++i) {
       roads_kept[i] = roads_kept[i + 16];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ void RoadSortingLayer::apply(const unsigned int& first_n,`
`97`	`97`	`roads_kept, 32, 16, [](const road_t& lhs, const road_t& rhs) -> int { return lhs.quality < rhs.quality; });`
`98`	`98`
`99`	`99`	`// Shift everything 16 cols to the left`
`100`		`- for (unsigned int i = 16; i < keep_n_roads; ++i) {`
	`100`	`+ for (unsigned int i = 16; i < (keep_n_roads - 16); ++i) {`
`101`	`101`	`roads_kept[i] = roads_kept[i + 16];`
`102`	`102`	`}`
`103`	`103`