diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | enum.c | 20 | ||||
| -rw-r--r-- | test/ruby/test_enum.rb | 16 |
3 files changed, 42 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Sat Feb 28 17:18:39 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * enum.c (enum_each_slice, enum_each_cons): limit elements size by + the enumerator size. suggested by Hans Mackowiak <hanmac AT + gmx.de> at [ruby-core:68335] + Sat Feb 28 15:44:20 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_dump.c (rb_vm_bugreport): get rid of making new strings @@ -314,6 +314,24 @@ enum_size(VALUE self, VALUE args, VALUE eobj) return (r == Qundef) ? Qnil : r; } +static long +limit_by_enum_size(VALUE obj, long n) +{ + unsigned long limit; + VALUE size = rb_check_funcall(obj, id_size, 0, 0); + if (size == Qundef) return n; + limit = NUM2ULONG(size); + return ((unsigned long)n > limit) ? limit : n; +} + +static int +enum_size_over_p(VALUE obj, long n) +{ + VALUE size = rb_check_funcall(obj, id_size, 0, 0); + if (size == Qundef) return 0; + return ((unsigned long)n > NUM2ULONG(size)); +} + /* * call-seq: * enum.find_all { |obj| block } -> array @@ -2187,6 +2205,7 @@ enum_each_slice(VALUE obj, VALUE n) if (size <= 0) rb_raise(rb_eArgError, "invalid slice size"); RETURN_SIZED_ENUMERATOR(obj, 1, &n, enum_each_slice_size); + size = limit_by_enum_size(obj, size); ary = rb_ary_new2(size); arity = rb_block_arity(); memo = NEW_MEMO(ary, dont_recycle_block_arg(arity), size); @@ -2264,6 +2283,7 @@ enum_each_cons(VALUE obj, VALUE n) if (size <= 0) rb_raise(rb_eArgError, "invalid size"); RETURN_SIZED_ENUMERATOR(obj, 1, &n, enum_each_cons_size); arity = rb_block_arity(); + if (enum_size_over_p(obj, size)) return Qnil; memo = NEW_MEMO(rb_ary_new2(size), dont_recycle_block_arg(arity), size); rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)memo); diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb index 532d1b965a..d9b8166f2e 100644 --- a/test/ruby/test_enum.rb +++ b/test/ruby/test_enum.rb @@ -348,6 +348,14 @@ class TestEnumerable < Test::Unit::TestCase ary.clear (1..10).each_slice(3, &lambda {|a, *| ary << a}) assert_equal([[1, 2, 3], [4, 5, 6], [7, 8, 9], [10]], ary, bug9749) + + ary.clear + (1..10).each_slice(10) {|a| ary << a} + assert_equal([[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]], ary) + + ary.clear + (1..10).each_slice(11) {|a| ary << a} + assert_equal([[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]], ary) end def test_each_cons @@ -359,6 +367,14 @@ class TestEnumerable < Test::Unit::TestCase ary.clear (1..5).each_cons(3, &lambda {|a, *| ary << a}) assert_equal([[1, 2, 3], [2, 3, 4], [3, 4, 5]], ary, bug9749) + + ary.clear + (1..5).each_cons(5) {|a| ary << a} + assert_equal([[1, 2, 3, 4, 5]], ary) + + ary.clear + (1..5).each_cons(6) {|a| ary << a} + assert_empty(ary) end def test_zip |