kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix crash on GC stress and RGENGC_CHECK_MODE=2

Browse source 
rb_ary_reset could leave the array in a bad state since it frees memory
but does not unset any flags. This can cause a crash on GC stress. This
commit changes rb_ary_reset to set the array as an empty embedded array.
This commit is contained in:
Peter Zhu 2022-03-12 12:15:04 -05:00
parent 83fabfccf5
commit 06594e7134
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
array.c
View file

@ -537,6 +537,9 @@ rb_ary_reset(VALUE ary)
else if (ARY_SHARED_P(ary)) {
rb_ary_unshare(ary);
}
FL_SET_EMBED(ary);
ARY_SET_EMBED_LEN(ary, 0);
}
static VALUE
@ -1079,8 +1082,8 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
rb_ary_modify(ary);
if (argc == 0) {
rb_ary_reset(ary);
FL_SET_EMBED(ary);
ARY_SET_EMBED_LEN(ary, 0);
assert(ARY_EMBED_P(ary));
assert(ARY_EMBED_LEN(ary) == 0);
if (rb_block_given_p()) {
rb_warning("given block not used");
}
@ -4394,7 +4397,7 @@ rb_ary_replace(VALUE copy, VALUE orig)
rb_ary_reset(copy);
if (RARRAY_LEN(orig) <= RARRAY_EMBED_LEN_MAX) {
FL_SET_EMBED(copy);
assert(ARY_EMBED_P(copy));
ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR_TRANSIENT(orig));
ARY_SET_LEN(copy, RARRAY_LEN(orig));
}