Skip to content

[pull] master from ruby:master #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 5 commits into from
Sep 10, 2025
Merged

[pull] master from ruby:master #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0887d82
dtoa.c: Add shortcut if arguments are zero
nobu Sep 9, 2025
d0c966a
dtoa.c: Extract macro to update 5powers Bigint cache atomically
nobu Sep 9, 2025
f047174
dtoa.c: Check memory allocation failures
nobu Sep 9, 2025
624538b
dtoa.c: Check integer underflow
nobu Sep 10, 2025
928fea3
Fix crash when $LOADED_FEATURES is modified during require
peterzhu2118 Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,11 @@ get_loaded_features_index(vm_ns_t *vm_ns)
VALUE previous_realpath_map = rb_hash_dup(realpath_map);
rb_hash_clear(realpaths);
rb_hash_clear(realpath_map);

/* We have to make a copy of features here because the StringValue call
* below could call a Ruby method, which could modify $LOADED_FEATURES
* and cause it to be corrupt. */
features = rb_ary_resurrect(features);
for (i = 0; i < RARRAY_LEN(features); i++) {
VALUE entry, as_str;
as_str = entry = rb_ary_entry(features, i);
Expand All @@ -456,6 +461,10 @@ get_loaded_features_index(vm_ns_t *vm_ns)
rb_ary_store(features, i, as_str);
features_index_add(vm_ns, as_str, INT2FIX(i));
}
/* The user modified $LOADED_FEATURES, so we should restore the changes. */
if (!rb_ary_shared_with_p(features, CURRENT_NS_LOADED_FEATURES(vm_ns))) {
rb_ary_replace(CURRENT_NS_LOADED_FEATURES(vm_ns), features);
}
reset_loaded_features_snapshot(vm_ns);

features = CURRENT_NS_LOADED_FEATURES_SNAPSHOT(vm_ns);
Expand Down
Loading