kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fixed crash when argument array is modified

Browse source
This commit is contained in:
Nobuyoshi Nakada 2020-03-25 01:23:03 +09:00
parent 1b3339528c
commit c7d668801b
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dir.c
View file

@ -3096,7 +3096,7 @@ dir_s_glob(int argc, VALUE *argv, VALUE obj)
ary = rb_push_glob(str, base, flags); ary = rb_push_glob(str, base, flags);
} }
else { else {
VALUE v = ary; VALUE v = rb_ary_replace(rb_ary_tmp_new(0), ary);
ary = dir_globs(RARRAY_LEN(v), RARRAY_CONST_PTR(v), base, flags); ary = dir_globs(RARRAY_LEN(v), RARRAY_CONST_PTR(v), base, flags);
RB_GC_GUARD(v); RB_GC_GUARD(v);
} }

12
test/ruby/test_dir.rb
View file

@ -517,4 +517,16 @@ class TestDir < Test::Unit::TestCase
assert_equal([*"a".."z"], list) assert_equal([*"a".."z"], list)
end; end;
end if defined?(Process::RLIMIT_NOFILE) end if defined?(Process::RLIMIT_NOFILE)
def test_glob_array_with_destructive_element
args = Array.new(100, "")
pat = Struct.new(:ary).new(args)
args.push(pat, *Array.new(100) {"."*40})
def pat.to_path
ary.clear
GC.start
""
end
assert_empty(Dir.glob(args))
end
end end