diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-12 15:28:56 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-12 15:28:56 +0000 |
| commit | ba76a79a3eeba71cc3d6ea952521e42415b025a6 (patch) | |
| tree | 5340825763fc0fb2fd63e72a99281d914e6565ec /enumerator.c | |
| parent | 45ce46087aa6666809cc0b213bc89837dae4bb39 (diff) | |
merge revision(s) 42450: [Backport #8735]
* enumerator.c (lazy_zip_func): fix non-single argument. fix
out-of-bound access and pack multiple yielded values.
[ruby-core:56383] [Bug #8735]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enumerator.c')
| -rw-r--r-- | enumerator.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/enumerator.c b/enumerator.c index edaa4ad307..63b033fc2f 100644 --- a/enumerator.c +++ b/enumerator.c @@ -1661,7 +1661,12 @@ lazy_zip_func(VALUE val, VALUE zip_args, int argc, VALUE *argv) } ary = rb_ary_new2(RARRAY_LEN(arg) + 1); - rb_ary_push(ary, argv[1]); + v = Qnil; + if (--argc > 0) { + ++argv; + v = argc > 1 ? rb_ary_new4(argc, argv) : *argv; + } + rb_ary_push(ary, v); for (i = 0; i < RARRAY_LEN(arg); i++) { v = rb_rescue2(call_next, RARRAY_PTR(arg)[i], next_stopped, 0, rb_eStopIteration, (VALUE)0); |