summaryrefslogtreecommitdiff
path: root/ruby.c
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-05-20 18:10:35 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-05-21 14:17:51 +0900
commitac00bdc8a8ac2c62a94dd36a7784d15bbcb7df19 (patch)
tree5383d64f7fec10132e7974c7e2a56edca0dc715e /ruby.c
parentf9696ca6cbfe827b7ce7199e511fa7431f9333b1 (diff)
Do not modify shared array
[Bug #15821]
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/ruby.c b/ruby.c
index bf94b8e..944b6c7 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1713,8 +1713,12 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
rb_obj_freeze(opt->script_name);
if (IF_UTF8_PATH(uenc != lenc, 1)) {
long i;
- VALUE load_path = GET_VM()->load_path;
+ rb_vm_t *vm = GET_VM();
+ VALUE load_path = vm->load_path;
const ID id_initial_load_path_mark = INITIAL_LOAD_PATH_MARK;
+ int modifiable = FALSE;
+
+ rb_get_expanded_load_path();
for (i = 0; i < RARRAY_LEN(load_path); ++i) {
VALUE path = RARRAY_AREF(load_path, i);
int mark = rb_attr_get(path, id_initial_load_path_mark) == path;
@@ -1726,8 +1730,15 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
path = rb_enc_associate(rb_str_dup(path), lenc);
#endif
if (mark) rb_ivar_set(path, id_initial_load_path_mark, path);
+ if (!modifiable) {
+ rb_ary_modify(load_path);
+ modifiable = TRUE;
+ }
RARRAY_ASET(load_path, i, path);
}
+ if (modifiable) {
+ rb_ary_replace(vm->load_path_snapshot, load_path);
+ }
}
Init_ext(); /* load statically linked extensions before rubygems */
if (opt->features.set & FEATURE_BIT(gems)) {