diff options
| -rw-r--r-- | array.c | 8 | ||||
| -rw-r--r-- | test/ruby/test_array.rb | 5 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 4 deletions
@@ -2886,13 +2886,15 @@ select_bang_ensure(VALUE a) long len = RARRAY_LEN(ary); long i1 = arg->len[0], i2 = arg->len[1]; - if (i2 < i1) { + if (i2 < len && i2 < i1) { + long tail = 0; if (i1 < len) { + tail = len - i1; 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; } diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 03e0b22223..753c34b2cf 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -2125,6 +2125,11 @@ class TestArray < Test::Unit::TestCase } assert_equal(9, r) 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 def test_delete2 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.3" #define RUBY_RELEASE_DATE "2017-03-27" -#define RUBY_PATCHLEVEL 261 +#define RUBY_PATCHLEVEL 262 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 |