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

enum.c: check argument first

Browse source 
* enum.c (enum_cycle_size): check an argument before the size of
  the receiver, if it is given.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-11-05 23:32:50 +00:00
parent 6c1f11592c
commit 4b7f531553
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
enum.c
View file

@ -2840,18 +2840,19 @@ cycle_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
static VALUE static VALUE
enum_cycle_size(VALUE self, VALUE args, VALUE eobj) enum_cycle_size(VALUE self, VALUE args, VALUE eobj)
{ {
long mul; long mul = 0;
VALUE n = Qnil; VALUE n = Qnil;
VALUE size = enum_size(self, args, 0); VALUE size;
if (size == Qnil) return Qnil;
if (FIXNUM_ZERO_P(size)) return size;
if (args && (RARRAY_LEN(args) > 0)) { if (args && (RARRAY_LEN(args) > 0)) {
n = RARRAY_AREF(args, 0); n = RARRAY_AREF(args, 0);
if (!NIL_P(n)) mul = NUM2LONG(n);
} }
if (n == Qnil) return DBL2NUM(INFINITY);
mul = NUM2LONG(n); size = enum_size(self, args, 0);
if (NIL_P(size) || FIXNUM_ZERO_P(size)) return size;
if (NIL_P(n)) return DBL2NUM(INFINITY);
if (mul <= 0) return INT2FIX(0); if (mul <= 0) return INT2FIX(0);
n = LONG2FIX(mul); n = LONG2FIX(mul);
return rb_funcallv(size, '*', 1, &n); return rb_funcallv(size, '*', 1, &n);

2
test/ruby/test_enumerator.rb
View file

@ -590,6 +590,8 @@ class TestEnumerator < Test::Unit::TestCase
assert_equal 126, @sized.cycle(3).size assert_equal 126, @sized.cycle(3).size
assert_equal Float::INFINITY, [].to_enum { 42 }.cycle.size assert_equal Float::INFINITY, [].to_enum { 42 }.cycle.size
assert_equal 0, [].to_enum { 0 }.cycle.size assert_equal 0, [].to_enum { 0 }.cycle.size
assert_raise(TypeError) {[].to_enum { 0 }.cycle("").size}
end end
def test_size_for_loops def test_size_for_loops

4
test/ruby/test_lazy_enumerator.rb
View file

@ -507,7 +507,9 @@ EOS
def size; 0; end def size; 0; end
include Enumerable include Enumerable
end end
assert_equal 0, obj.lazy.cycle.size lazy = obj.lazy
assert_equal 0, lazy.cycle.size
assert_raise(TypeError) {lazy.cycle("").size}
end end
def test_map_zip def test_map_zip