From 9a37bfdf63171f3d3e21b86fbe56054e3b5a06e8 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki@neon.tech>
Date: Sat, 5 Jul 2025 00:44:46 +0300
Subject: [PATCH] Fix re-finding an entry in bucket chain

---
 libs/neon-shmem/src/hash/entry.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/neon-shmem/src/hash/entry.rs b/libs/neon-shmem/src/hash/entry.rs
index cc7e48652a..bf2f63fe9c 100644
--- a/libs/neon-shmem/src/hash/entry.rs
+++ b/libs/neon-shmem/src/hash/entry.rs
@@ -72,8 +72,9 @@ impl<K, V> OccupiedEntry<'_, '_, K, V> {
             let mut prev = PrevPos::First(dict_idx as u32);
             let mut curr = self.map.dictionary[dict_idx];
             while curr != self.bucket_pos {
-                curr = self.map.buckets[curr as usize].next;
+                assert!(curr != INVALID_POS);
                 prev = PrevPos::Chained(curr);
+                curr = self.map.buckets[curr as usize].next;
             }
             prev
         } else {