diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-29 05:24:28 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-29 05:24:28 +0000 |
| commit | f984d0782bdd4efeea8f18eae6ba00f8a713f093 (patch) | |
| tree | 745c6509e31015c9e80c5a7d3356f81a9a196157 /enumerator.c | |
| parent | 9970b96af2388eeda481469dac0d03c1fddf549a (diff) | |
merge revision(s) 39594,39596: [Backport #8010]
* enumerator.c (enumerator_with_index_i): allow Bignum as offset, to
get rid of conversion exception and integer overflow.
[ruby-dev:47131] [Bug #8010]
* enumerator.c (enumerator_with_index): Restore handling of a nil memo
from r39594.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44744 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enumerator.c')
| -rw-r--r-- | enumerator.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/enumerator.c b/enumerator.c index 09ef298396..451327569e 100644 --- a/enumerator.c +++ b/enumerator.c @@ -368,11 +368,9 @@ enumerator_each(VALUE obj) static VALUE enumerator_with_index_i(VALUE val, VALUE m, int argc, VALUE *argv) { - VALUE idx; VALUE *memo = (VALUE *)m; - - idx = INT2FIX(*memo); - ++*memo; + VALUE idx = *memo; + *memo = rb_int_succ(idx); if (argc <= 1) return rb_yield_values(2, val, idx); @@ -399,7 +397,10 @@ enumerator_with_index(int argc, VALUE *argv, VALUE obj) rb_scan_args(argc, argv, "01", &memo); RETURN_ENUMERATOR(obj, argc, argv); - memo = NIL_P(memo) ? 0 : (VALUE)NUM2LONG(memo); + if (NIL_P(memo)) + memo = INT2FIX(0); + else + memo = rb_to_int(memo); return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)&memo); } |