archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) ac00bdc8a8: [Backport #15821]

Browse source 
Do not modify shared array
	
	[Bug #15821]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2019-08-26 15:02:19 +00:00
parent 401da79188
commit 2576b8b26a
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ruby.c
View file

@ -1604,8 +1604,12 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
rb_obj_freeze(opt->script_name); rb_obj_freeze(opt->script_name);
if (IF_UTF8_PATH(uenc != lenc, 1)) { if (IF_UTF8_PATH(uenc != lenc, 1)) {
long i; 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; 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) { for (i = 0; i < RARRAY_LEN(load_path); ++i) {
VALUE path = RARRAY_AREF(load_path, i); VALUE path = RARRAY_AREF(load_path, i);
int mark = rb_attr_get(path, id_initial_load_path_mark) == path; int mark = rb_attr_get(path, id_initial_load_path_mark) == path;
@ -1617,8 +1621,15 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
path = rb_enc_associate(rb_str_dup(path), lenc); path = rb_enc_associate(rb_str_dup(path), lenc);
#endif #endif
if (mark) rb_ivar_set(path, id_initial_load_path_mark, path); 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); 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 */ Init_ext(); /* load statically linked extensions before rubygems */
if (opt->features & FEATURE_BIT(gems)) { if (opt->features & FEATURE_BIT(gems)) {

4
test/ruby/test_gc.rb
View file

@ -383,6 +383,10 @@ class TestGc < Test::Unit::TestCase
end; end;
end end
def test_gc_stress_at_startup
assert_in_out_err([{"RUBY_DEBUG"=>"gc_stress"}], '', [], [], '[Bug #15784]', success: true)
end
def test_gc_disabled_start def test_gc_disabled_start
begin begin
disabled = GC.disable disabled = GC.disable

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.6" #define RUBY_VERSION "2.5.6"
#define RUBY_RELEASE_DATE "2019-08-26" #define RUBY_RELEASE_DATE "2019-08-26"
#define RUBY_PATCHLEVEL 178 #define RUBY_PATCHLEVEL 179
#define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 8 #define RUBY_RELEASE_MONTH 8