diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | array.c | 8 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Thu Jan 2 00:53:16 2014 Masaki Matsushita <glass.saga@gmail.com> + + * array.c (rb_ary_zip): use ALLOCV_N() instead of ALLOCA_N(). + Thu Jan 2 00:04:29 2014 Masaki Matsushita <glass.saga@gmail.com> * hash.c (rb_hash_keys): make rb_hash_keys() static. @@ -3240,8 +3240,10 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary) if (rb_block_given_p()) { int arity = rb_block_arity(); - if (arity > 1 && argc+1 < 0x100) { - VALUE *tmp = ALLOCA_N(VALUE, argc+1); + if (arity > 1) { + VALUE work, *tmp; + + tmp = ALLOCV_N(VALUE, work, argc+1); for (i=0; i<RARRAY_LEN(ary); i++) { tmp[0] = RARRAY_AREF(ary, i); @@ -3250,6 +3252,8 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary) } rb_yield_values2(argc+1, tmp); } + + if (work) ALLOCV_END(work); } else { for (i=0; i<RARRAY_LEN(ary); i++) { |