Changeset a853075 in mainline

Timestamp:

2018-07-05T21:41:25Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7ca51cc

Parents:

1caddc6

git-author:

Dzejrou <dzejrou@…> (2018-07-03 19:56:22)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:25)

Message:

cpp: fixed test crashes on amd64 caused by list invalidation during erase

File:

• uspace/lib/cpp/include/__bits/adt/hash_table_policies.hpp (modified) (2 diffs)

uspace/lib/cpp/include/__bits/adt/hash_table_policies.hpp

@@ -342 +342 @@
                 auto tmp = current;
                 current = current->next;
-                tmp->unlink();
-
-                --table.size_;
+                tmp->next = tmp;
+                tmp->prev = tmp;
+
                 if (!table.keys_equal(key, tmp->value))
                 {
@@ -355 +355 @@
                 else
                 {
+                    --table.size_;
                     ++res;