summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Wu <XrXr@users.noreply.github.com>2020-03-13 20:59:55 -0400
committerAlan Wu <XrXr@users.noreply.github.com>2020-03-15 18:11:52 -0400
commit713dc619f5372a645b66bef9dacee217c4101cb4 (patch)
tree41222b5a9a6ff6c8db375e86c042a87d371819b8
parentf14409c9bb65451618b5f2da82ab9b138ec77469 (diff)
Add missing write barrier for Hash#transform_values{,!}
21994b7fd686f263544fcac1616ecf3189fb78b3 removed the write barrier that was present in rb_hash_aset(). Re-insert it to not crash during GC. [Bug #16689]
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/2964
-rw-r--r--hash.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hash.c b/hash.c
index 62383a6c92..5bbb3da5f2 100644
--- a/hash.c
+++ b/hash.c
@@ -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;