diff options
-rw-r--r-- | enum.c | 12 | ||||
-rw-r--r-- | test/ruby/test_enum.rb | 13 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 23 insertions, 4 deletions
@@ -2337,14 +2337,20 @@ static VALUE enum_reverse_each(int argc, VALUE *argv, VALUE obj) { VALUE ary; - long i; + long len; RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size); ary = enum_to_a(argc, argv, obj); - for (i = RARRAY_LEN(ary); --i >= 0; ) { - rb_yield(RARRAY_AREF(ary, i)); + len = RARRAY_LEN(ary); + while (len--) { + long nlen; + rb_yield(RARRAY_AREF(ary, len)); + nlen = RARRAY_LEN(ary); + if (nlen < len) { + len = nlen; + } } return obj; diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb index c56e280e06..568fa0ea8d 100644 --- a/test/ruby/test_enum.rb +++ b/test/ruby/test_enum.rb @@ -730,6 +730,19 @@ class TestEnumerable < Test::Unit::TestCase assert_equal([2,1,3,2,1], @obj.reverse_each.to_a) end + def test_reverse_each_memory_corruption + bug16354 = '[ruby-dev:50867]' + assert_normal_exit %q{ + size = 1000 + (0...size).reverse_each do |i| + i.inspect + ObjectSpace.each_object(Array) do |a| + a.clear if a.length == size + end + end + }, bug16354 + end + def test_chunk e = [].chunk {|elt| true } assert_equal([], e.to_a) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.6" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 122 +#define RUBY_PATCHLEVEL 123 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 12 |