Merge pull request #22929 from Windfisch/oa_hashmap_test

Fix bug and add testcase for OAHashMap losing keys

2 files changed, 31 insertions, 2 deletions

diff --git a/core/oa_hash_map.h b/core/oa_hash_map.h
index 3705762d6c..9840442519 100644
--- a/core/oa_hash_map.h
+++ b/core/oa_hash_map.h
@@ -125,7 +125,7 @@ private:
 
 		while (42) {
 			if (hashes[pos] == EMPTY_HASH) {
-				_construct(pos, hash, p_key, p_value);
+				_construct(pos, hash, key, value);
 
 				return;
 			}
@@ -136,7 +136,7 @@ private:
 
 				if (hashes[pos] & DELETED_HASH_BIT) {
 					// we found a place where we can fit in!
-					_construct(pos, hash, p_key, p_value);
+					_construct(pos, hash, key, value);
 
 					return;
 				}
diff --git a/main/tests/test_oa_hash_map.cpp b/main/tests/test_oa_hash_map.cpp
index 26e728d3aa..deaba285cf 100644
--- a/main/tests/test_oa_hash_map.cpp
+++ b/main/tests/test_oa_hash_map.cpp
@@ -92,6 +92,35 @@ MainLoop *test() {
 		}
 	}
 
+	// stress test / test for issue #22928
+	{
+		OAHashMap<int, int> map;
+		int dummy;
+		const int N = 1000;
+		uint32_t *keys = new uint32_t[N];
+
+		Math::seed(0);
+
+		// insert a couple of random keys (with a dummy value, which is ignored)
+		for (int i = 0; i < N; i++) {
+			keys[i] = Math::rand();
+			map.set(keys[i], dummy);
+
+			if (!map.lookup(keys[i], dummy))
+				OS::get_singleton()->print("could not find 0x%X despite it was just inserted!\n", unsigned(keys[i]));
+		}
+
+		// check whether the keys are still present
+		for (int i = 0; i < N; i++) {
+			if (!map.lookup(keys[i], dummy)) {
+				OS::get_singleton()->print("could not find 0x%X despite it has been inserted previously! (not checking the other keys, breaking...)\n", unsigned(keys[i]));
+				break;
+			}
+		}
+
+		delete[] keys;
+	}
+
 	return NULL;
 }
 } // namespace TestOAHashMap