summaryrefslogtreecommitdiff
path: root/AK
diff options
context:
space:
mode:
authorJelle Raaijmakers <jelle@gmta.nl>2023-03-15 18:37:55 +0100
committerJelle Raaijmakers <jelle@gmta.nl>2023-03-15 21:43:52 +0100
commit954d66009435a307732bd296cfe8660570c4900c (patch)
tree5b420466d1e0fec9362a21982681c7b50954e5d8 /AK
parentd16d805d96d08685e7259569b4ea8875a8124488 (diff)
downloadserenity-954d66009435a307732bd296cfe8660570c4900c.zip
AK: Clear OrderedHashTable previous/next pointers on removal
With Clang, the previous/next pointers in buckets of an `OrderedHashTable` are not cleared when a bucket is being shifted up as a result of a removed bucket. As a result, an unfortunate pointer mixup could lead to an infinite loop in the `HashTable` iterator, which was exposed in `HashMap::keys()`. Co-authored-by: Luke Wilde <lukew@serenityos.org>
Diffstat (limited to 'AK')
-rw-r--r--AK/HashTable.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/AK/HashTable.h b/AK/HashTable.h
index 9ac8c9d507..a3a59560b5 100644
--- a/AK/HashTable.h
+++ b/AK/HashTable.h
@@ -690,6 +690,10 @@ private:
auto* shift_to_bucket = &m_buckets[shift_to_index];
*shift_to_bucket = move(*shift_from_bucket);
+ if constexpr (IsOrdered) {
+ shift_from_bucket->previous = nullptr;
+ shift_from_bucket->next = nullptr;
+ }
shift_to_bucket->state = bucket_state_for_probe_length(shift_from_probe_length - 1);
update_bucket_neighbours(shift_to_bucket);