Make WeakKeyMap safe for compaction during allocation

During allocation, the table may not have been allocated yet which would crash in the st_foreach.
ruby · Dec 12, 2023 · 185b7e9 · 185b7e9
1 parent 33cf8f6
commit 185b7e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/test/ruby/test_weakkeymap.rb b/test/ruby/test_weakkeymap.rb
@@ -123,6 +123,10 @@ def test_compaction
     end;
   end
 
+  def test_gc_compact_stress
+    EnvUtil.under_gc_compact_stress { ObjectSpace::WeakKeyMap.new }
+  end
+
   private
 
   def assert_weak_include(m, k, n = 100)

diff --git a/weakmap.c b/weakmap.c
@@ -609,7 +609,9 @@ wkmap_compact(void *ptr)
 {
     struct weakkeymap *w = ptr;
 
-    st_foreach_with_replace(w->table, wkmap_compact_table_i, wkmap_compact_table_replace, (st_data_t)0);
+    if (w->table) {
+        st_foreach_with_replace(w->table, wkmap_compact_table_i, wkmap_compact_table_replace, (st_data_t)0);
+    }
 }
 
 static const rb_data_type_t weakkeymap_type = {