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

Add not null checks to rb_gc_vm_weak_table_foreach

Browse Source 
If the tables are null (which happens when a GC is ran at boot), it will
segfault when trying to iterate.
This commit is contained in:
Peter Zhu 2025-01-16 09:28:34 -05:00
parent 5df20ab0b4
commit d78aef5e3f
Notes: git 2025-01-16 15:32:09 +00:00 
Merged: https://github.com/ruby/ruby/pull/12591
1 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
gc.c
View File

@ -3424,49 +3424,59 @@ rb_gc_vm_weak_table_foreach(vm_table_foreach_callback_func callback,
switch (table) { switch (table) {
case RB_GC_VM_CI_TABLE: { case RB_GC_VM_CI_TABLE: {
st_foreach_with_replace( if (vm->ci_table) {
vm->ci_table, st_foreach_with_replace(
vm_weak_table_foreach_key, vm->ci_table,
vm_weak_table_foreach_update_key, vm_weak_table_foreach_key,
(st_data_t)&foreach_data vm_weak_table_foreach_update_key,
); (st_data_t)&foreach_data
);
}
break; break;
} }
case RB_GC_VM_OVERLOADED_CME_TABLE: { case RB_GC_VM_OVERLOADED_CME_TABLE: {
st_foreach_with_replace( if (vm->overloaded_cme_table) {
vm->overloaded_cme_table, st_foreach_with_replace(
vm_weak_table_foreach_key, vm->overloaded_cme_table,
vm_weak_table_foreach_update_key, vm_weak_table_foreach_key,
(st_data_t)&foreach_data vm_weak_table_foreach_update_key,
); (st_data_t)&foreach_data
);
}
break; break;
} }
case RB_GC_VM_GLOBAL_SYMBOLS_TABLE: { case RB_GC_VM_GLOBAL_SYMBOLS_TABLE: {
st_foreach_with_replace( if (global_symbols.str_sym) {
global_symbols.str_sym, st_foreach_with_replace(
vm_weak_table_str_sym_foreach, global_symbols.str_sym,
vm_weak_table_foreach_update_value, vm_weak_table_str_sym_foreach,
(st_data_t)&foreach_data vm_weak_table_foreach_update_value,
); (st_data_t)&foreach_data
);
}
break; break;
} }
case RB_GC_VM_GENERIC_IV_TABLE: { case RB_GC_VM_GENERIC_IV_TABLE: {
st_table *generic_iv_tbl = rb_generic_ivtbl_get(); st_table *generic_iv_tbl = rb_generic_ivtbl_get();
st_foreach_with_replace( if (generic_iv_tbl) {
generic_iv_tbl, st_foreach_with_replace(
vm_weak_table_gen_ivar_foreach, generic_iv_tbl,
vm_weak_table_foreach_update_key, vm_weak_table_gen_ivar_foreach,
(st_data_t)&foreach_data vm_weak_table_foreach_update_key,
); (st_data_t)&foreach_data
);
}
break; break;
} }
case RB_GC_VM_FROZEN_STRINGS_TABLE: { case RB_GC_VM_FROZEN_STRINGS_TABLE: {
st_foreach_with_replace( if (vm->frozen_strings) {
vm->frozen_strings, st_foreach_with_replace(
vm_weak_table_frozen_strings_foreach, vm->frozen_strings,
vm_weak_table_foreach_update_key, vm_weak_table_frozen_strings_foreach,
(st_data_t)&foreach_data vm_weak_table_foreach_update_key,
); (st_data_t)&foreach_data
);
}
break; break;
} }
default: default: