Fix UB in SpiralIterator::operator++

Ryanf55 · Ryanf55 · commit d215049aa479 · 2024-11-27T11:00:41.000-07:00
* Calling pop_back on an iterator past the end is UB

Signed-off-by: Ryan Friedman &lt;25047695+Ryanf55@users.noreply.github.com&gt;
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;

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ const Eigen::Array2i & SpiralIterator::operator*() const`
`66`	`66`
`67`	`67`	`SpiralIterator & SpiralIterator::operator++()`
`68`	`68`	`{`
	`69`	`+ if (isPastEnd()) {`
	`70`	`+ return *this;`
	`71`	`+ }`
`69`	`72`	`pointsRing_.pop_back();`
`70`	`73`	`if (pointsRing_.empty() && !isPastEnd()) {generateRing();}`
`71`	`74`	`return *this;`