From 2cb50ea529d5eed79e3487e91436542d7a0e0d53 Mon Sep 17 00:00:00 2001
From: lisenokdonbassenok <lisdonbassa@gmail.com>
Date: Fri, 30 Jan 2026 11:00:50 +0200
Subject: [PATCH 1/2] fix: ensure EntitySet::insert reserves correct capacity

---
 crates/environ/src/collections/entity_set.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/environ/src/collections/entity_set.rs b/crates/environ/src/collections/entity_set.rs
index 5eac9c24383f..d4bc95647c0e 100644
--- a/crates/environ/src/collections/entity_set.rs
+++ b/crates/environ/src/collections/entity_set.rs
@@ -67,7 +67,7 @@ where
     /// Returns `true` if `k` was not present in the set, i.e. this is a
     /// newly-added element. Returns `false` otherwise.
     pub fn insert(&mut self, k: K) -> Result<bool, OutOfMemory> {
-        self.inner.try_ensure_capacity(k.index())?;
+        self.inner.try_ensure_capacity(k.index() + 1)?;
         Ok(self.inner.insert(k))
     }
 

From 0225cd444a9a1ccc19e5f1423af7cbe61a0f4cec Mon Sep 17 00:00:00 2001
From: lisenokdonbassenok <lisdonbassa@gmail.com>
Date: Sun, 1 Feb 2026 16:45:58 +0200
Subject: [PATCH 2/2] add test

---
 crates/fuzzing/tests/oom.rs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/crates/fuzzing/tests/oom.rs b/crates/fuzzing/tests/oom.rs
index 2e022e5aefd8..3e55ca6cc511 100644
--- a/crates/fuzzing/tests/oom.rs
+++ b/crates/fuzzing/tests/oom.rs
@@ -124,6 +124,24 @@ fn secondary_map_try_insert() -> Result<()> {
     })
 }
 
+#[test]
+fn entity_set_ensure_capacity() -> Result<()> {
+    OomTest::new().test(|| {
+        let mut set = EntitySet::<Key>::new();
+        set.ensure_capacity(100)?;
+        Ok(())
+    })
+}
+
+#[test]
+fn entity_set_insert() -> Result<()> {
+    OomTest::new().test(|| {
+        let mut set = EntitySet::<Key>::new();
+        set.insert(Key::from_u32(256))?;
+        Ok(())
+    })
+}
+
 #[test]
 fn vec_with_capacity() -> Result<()> {
     OomTest::new().test(|| {