From 4b7f531553100afad272c7078b23e6e32989bc2a Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 5 Nov 2017 23:32:50 +0000 Subject: enum.c: check argument first * 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 --- enum.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'enum.c') diff --git a/enum.c b/enum.c index 2b2806a6c8..086e3aa13c 100644 --- a/enum.c +++ b/enum.c @@ -2840,18 +2840,19 @@ cycle_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary)) static VALUE enum_cycle_size(VALUE self, VALUE args, VALUE eobj) { - long mul; + long mul = 0; VALUE n = Qnil; - VALUE size = enum_size(self, args, 0); - - if (size == Qnil) return Qnil; - if (FIXNUM_ZERO_P(size)) return size; + VALUE size; if (args && (RARRAY_LEN(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); n = LONG2FIX(mul); return rb_funcallv(size, '*', 1, &n); -- cgit v1.2.1