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

array.c: do not resize to less than 0

Browse source 
Shrinking the Array from the block invoked by Array#select! or
Array#reject! causes the Array to be a negative number size. Ensure that
the resulting Array won't be smaller than 0.
[ruby-core:78739] [Bug #13053]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
rhe 2016-12-20 06:53:44 +00:00
parent 2034248712
commit b5da45d6d7
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
array.c
View file

@ -2886,13 +2886,15 @@ select_bang_ensure(VALUE a)
long len = RARRAY_LEN(ary); long len = RARRAY_LEN(ary);
long i1 = arg->len[0], i2 = arg->len[1]; long i1 = arg->len[0], i2 = arg->len[1];
if (i2 < i1) { if (i2 < len && i2 < i1) {
long tail = 0;
if (i1 < len) { if (i1 < len) {
tail = len - i1;
RARRAY_PTR_USE(ary, ptr, { RARRAY_PTR_USE(ary, ptr, {
MEMMOVE(ptr + i2, ptr + i1, VALUE, len - i1); MEMMOVE(ptr + i2, ptr + i1, VALUE, tail);
}); });
} }
ARY_SET_LEN(ary, len - i1 + i2); ARY_SET_LEN(ary, i2 + tail);
} }
return ary; return ary;
} }

5
test/ruby/test_array.rb
View file

@ -2163,6 +2163,11 @@ class TestArray < Test::Unit::TestCase
} }
assert_equal(9, r) assert_equal(9, r)
assert_equal(@cls[7, 8, 9, 10], a, bug10722) assert_equal(@cls[7, 8, 9, 10], a, bug10722)
bug13053 = '[ruby-core:78739] [Bug #13053] Array#select! can resize to negative size'
a = @cls[ 1, 2, 3, 4, 5 ]
a.select! {|i| a.clear if i == 5; false }
assert_equal(0, a.size, bug13053)
end end
# also select! # also select!