Merge pull request #145 from dlang-community/fix_insert

jcrapuchettes · web-flow · commit f718ec122982 · 2019-04-29T16:30:24.000-07:00
Fix use-after-free when an insert causes a rehash
diff --git a/src/containers/hashmap.d b/src/containers/hashmap.d
@@ -496,8 +496,18 @@ private:
 		if (modifyLength)
 			_length++;
 		if (shouldRehash())
+		{
 			rehash();
-		return n;
+			immutable newIndex = hashToIndex(hash, buckets.length);
+			foreach (ref item; buckets[newIndex])
+			{
+				if (item.hash == hash && item.key == key)
+					return &item;
+			}
+			assert(false);
+		}
+		else
+			return n;
 	}
 
 	/**
