Fix UB in SpiralIterator::operator++ (#481) (#487)

* Calling pop_back on an iterator past the end is UB Signed-off-by: Ryan Friedman <[email protected]> (cherry picked from commit 74dbbc8) Co-authored-by: Ryan <[email protected]>
ANYbotics · Nov 28, 2024 · d55b2ee · d55b2ee
1 parent 747ddaa
commit d55b2ee
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/grid_map_core/src/iterators/SpiralIterator.cpp b/grid_map_core/src/iterators/SpiralIterator.cpp
@@ -66,6 +66,9 @@ const Eigen::Array2i & SpiralIterator::operator*() const
 
 SpiralIterator & SpiralIterator::operator++()
 {
+  if (isPastEnd()) {
+    return *this;
+  }
   pointsRing_.pop_back();
   if (pointsRing_.empty() && !isPastEnd()) {generateRing();}
   return *this;