diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-12 16:02:08 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-12 16:02:08 +0000 |
| commit | de13975790da4c6928c253e915444932a25fdb7f (patch) | |
| tree | cc829ae64576e5a9a1313070ffc3d57454ce6311 /enumerator.c | |
| parent | c27bd84806454f4627d8957a87b6186da1aab089 (diff) | |
merge revision(s) 39722: [Backport #9178]
* enumerator.c (enumerator_with_index): try to convert given offset to
integer. fix bug introduced in r39594.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enumerator.c')
| -rw-r--r-- | enumerator.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/enumerator.c b/enumerator.c index e20a612358..4ba0ac6f12 100644 --- a/enumerator.c +++ b/enumerator.c @@ -493,7 +493,9 @@ enumerator_with_index(int argc, VALUE *argv, VALUE obj) rb_scan_args(argc, argv, "01", &memo); RETURN_SIZED_ENUMERATOR(obj, argc, argv, enumerator_size); if (NIL_P(memo)) - memo = INT2NUM(0); + memo = INT2FIX(0); + else + memo = rb_to_int(memo); return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)NEW_MEMO(memo, 0, 0)); } |