itsscb/heapless
1
0
Fork 0
mirror of https://github.com/rust-embedded/heapless.git synced 2025-09-28 13:00:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

indexmap: use correct index when inserting through entry api

Browse Source 
When inserting using the entry API and the robin-hood case is hit,
we currently return using the incorrect index, which in turn
returns a reference to the wrong entry in the map, causing
undefined behaviour in the API.
This commit is contained in:
Shaun Bennett 2023-03-15 15:22:24 -04:00 committed by Dario Nieuwenhuis
parent 83801651b6
commit a4bfe3e655
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/indexmap.rs
View File

@ -209,12 +209,9 @@ where
// robin hood: steal the spot if it's better for us
let index = self.entries.len();
unsafe { self.entries.push_unchecked(Bucket { hash, key, value }) };
Self::insert_phase_2(&mut self.indices, probe, Pos::new(index, hash));
return Insert::Success(Inserted {
index: Self::insert_phase_2(
&mut self.indices,
probe,
Pos::new(index, hash),
),
index,
old_value: None,
});
} else if entry_hash == hash && unsafe { self.entries.get_unchecked(i).key == key }
@ -1372,7 +1369,7 @@ mod tests {
panic!("Entry found when empty");
}
Entry::Vacant(v) => {
v.insert(value).unwrap();
assert_eq!(value, *v.insert(value).unwrap());
}
};
assert_eq!(value, *src.get(&key).unwrap())