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

Add missing write barrier for Hash#transform_values{,!}

Browse Source 
21994b7fd686f263544fcac1616ecf3189fb78b3 removed the write barrier that
was present in rb_hash_aset(). Re-insert it to not crash during GC.

[Bug #16689]
This commit is contained in:
Alan Wu 2020-03-13 20:59:55 -04:00
parent f14409c9bb
commit 713dc619f5
Notes: git 2020-03-16 07:12:25 +09:00 
Merged: https://github.com/ruby/ruby/pull/2964
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hash.c
View File

@ -3257,7 +3257,8 @@ static int
transform_values_foreach_replace(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
{
VALUE new_value = rb_yield((VALUE)*value);
*value = new_value;
VALUE hash = (VALUE)argp;
RB_OBJ_WRITE(hash, value, new_value);
return ST_CONTINUE;
}
@ -3287,7 +3288,7 @@ rb_hash_transform_values(VALUE hash)
result = hash_copy(hash_alloc(rb_cHash), hash);
if (!RHASH_EMPTY_P(hash)) {
rb_hash_stlike_foreach_with_replace(result, transform_values_foreach_func, transform_values_foreach_replace, 0);
rb_hash_stlike_foreach_with_replace(result, transform_values_foreach_func, transform_values_foreach_replace, result);
}
return result;
@ -3317,7 +3318,7 @@ rb_hash_transform_values_bang(VALUE hash)
rb_hash_modify_check(hash);
if (!RHASH_TABLE_EMPTY_P(hash)) {
rb_hash_stlike_foreach_with_replace(hash, transform_values_foreach_func, transform_values_foreach_replace, 0);
rb_hash_stlike_foreach_with_replace(hash, transform_values_foreach_func, transform_values_foreach_replace, hash);
}
return hash;