1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make WeakMap safe for compaction during allocation

Browse Source 
During allocation, the table may not have been allocated yet which would
crash in the st_foreach.
This commit is contained in:
Peter Zhu 2023-12-08 15:17:51 -05:00
parent d313c82f79
commit 33cf8f640b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/ruby/test_weakmap.rb
View File

@ -237,6 +237,10 @@ class TestWeakMap < Test::Unit::TestCase
end; end;
end end
def test_gc_compact_stress
EnvUtil.under_gc_compact_stress { ObjectSpace::WeakMap.new }
end
def test_replaced_values_bug_19531 def test_replaced_values_bug_19531
a = "A".dup a = "A".dup
b = "B".dup b = "B".dup

4
weakmap.c
View File

@ -144,7 +144,9 @@ wmap_compact(void *ptr)
{ {
struct weakmap *w = ptr; struct weakmap *w = ptr;
st_foreach(w->table, wmap_compact_table_i, (st_data_t)w->table); if (w->table) {
st_foreach(w->table, wmap_compact_table_i, (st_data_t)w->table);
}
} }
static const rb_data_type_t weakmap_type = { static const rb_data_type_t weakmap_type = {