Avoid overflow ptr arithmetic at the end

jonhoo · jonhoo · commit 847b441fda61 · 2020-07-03T13:26:00.000-04:00
Thanks again miri!
diff --git a/src/raw/mod.rs b/src/raw/mod.rs
@@ -1456,7 +1456,9 @@ impl<T> RawIter<T> {
                 return;
             }
 
-            if b.as_ptr() <= self.iter.data.next_n(Group::WIDTH).as_ptr() {
+            if self.iter.next_ctrl < self.iter.end
+                && b.as_ptr() <= self.iter.data.next_n(Group::WIDTH).as_ptr()
+            {
                 // The iterator has not yet reached the bucket's group.
                 // We don't need to reload anything, but we do need to adjust the item count.
 

Original file line number	Diff line number	Diff line change
`@@ -1456,7 +1456,9 @@ impl<T> RawIter<T> {`
`1456`	`1456`	`return;`
`1457`	`1457`	`}`
`1458`	`1458`
`1459`		`- if b.as_ptr() <= self.iter.data.next_n(Group::WIDTH).as_ptr() {`
	`1459`	`+ if self.iter.next_ctrl < self.iter.end`
	`1460`	`+ && b.as_ptr() <= self.iter.data.next_n(Group::WIDTH).as_ptr()`
	`1461`	`+ {`
`1460`	`1462`	`// The iterator has not yet reached the bucket's group.`
`1461`	`1463`	`// We don't need to reload anything, but we do need to adjust the item count.`
`1462`	`1464`