Fix infinite empty rbtree iteration, bump version to 0.10.5

Author: MrElectrify

Cargo.lock

@@ -3,7 +3,7 @@ name = "eastl-rs"
 authors = ["Andrew Buck"]
 description = "EASTL binary-compatible Rust implementations"
 documentation = "https://docs.rs/crate/eastl-rs"
-version = "0.10.4"
+version = "0.10.5"
 edition = "2021"
 license-file = "LICENSE"
 readme = "README.md"

Cargo.toml

@@ -1,21 +1,28 @@
 use crate::internal::rb_tree::node::Node;
 use std::marker::PhantomData;
+use std::ptr;
 
 /// An iterator over a Red-Black tree's nodes.
 pub struct Iter<'a, K, V> {
     pub(super) node: *mut Node<K, V>,
+    pub(super) end: *mut Node<K, V>,
     pub(super) _marker: PhantomData<&'a ()>,
 }
 
 pub struct IterMut<'a, K, V> {
     pub(super) node: *mut Node<K, V>,
+    pub(super) end: *mut Node<K, V>,
     pub(super) _marker: PhantomData<&'a mut ()>,
 }
 
 impl<'a, K: 'a, V: 'a> Iterator for Iter<'a, K, V> {
     type Item = (&'a K, &'a V);
 
     fn next(&mut self) -> Option<Self::Item> {
+        if ptr::eq(self.node, self.end) {
+            return None;
+        }
+
         unsafe { self.node.as_ref() }
             .and_then(Node::next)
             .map(|node| (node.key(), node.val()))
@@ -26,6 +33,10 @@ impl<'a, K: 'a, V: 'a> Iterator for IterMut<'a, K, V> {
     type Item = (&'a K, &'a mut V);
 
     fn next(&mut self) -> Option<Self::Item> {
+        if ptr::eq(self.node, self.end) {
+            return None;
+        }
+
         unsafe { self.node.as_mut() }
             .and_then(Node::next_mut)
             .map(|node| (&node.pair.0, &mut node.pair.1))

src/internal/rb_tree/iter.rs

@@ -171,6 +171,7 @@ impl<K: Eq, V, A: Allocator, C: Compare<K>> RBTree<K, V, A, C> {
     pub unsafe fn iter(self: Self) -> Iter<K, V> {
         Iter {
             node: self.begin,
+            end: self.end,
             _marker: PhantomData,
         }
     }