diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-28 11:29:57 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-28 11:29:57 +0000 |
| commit | 519f4ee13ab57183dc1268ffd12cb6950e1c2061 (patch) | |
| tree | d39193b9d4db25052929ad9250e61f710ec237b0 | |
| parent | 6aa3e5170e66342a1397c40360f4db802a76a4c3 (diff) | |
| download | ruby-519f4ee13ab57183dc1268ffd12cb6950e1c2061.tar.gz ruby-519f4ee13ab57183dc1268ffd12cb6950e1c2061.tar.xz ruby-519f4ee13ab57183dc1268ffd12cb6950e1c2061.zip | |
* vm_insnhelper.c (vm_yield_setup_args): object with to_ary should
behave like array. a patch from Yusuke Endoh <mame at tsg.ne.jp>
in [ruby-dev:35988]. [ruby-dev:35977]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | vm_insnhelper.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Thu Aug 28 20:22:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * vm_insnhelper.c (vm_yield_setup_args): object with to_ary should + behave like array. a patch from Yusuke Endoh <mame at tsg.ne.jp> + in [ruby-dev:35988]. [ruby-dev:35977] + Thu Aug 28 19:04:50 2008 NAKAMURA Usaku <usa@ruby-lang.org> * bootstraptest/test_io.rb: no need to create real file. diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 07fe32d2a..f40d6a241 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -704,6 +704,7 @@ vm_yield_setup_args(rb_thread_t * const th, const rb_iseq_t *iseq, int i; int argc = orig_argc; const int m = iseq->argc; + VALUE ary; th->mark_stack_len = argc; @@ -714,8 +715,7 @@ vm_yield_setup_args(rb_thread_t * const th, const rb_iseq_t *iseq, */ if (!(iseq->arg_simple & 0x02) && (m + iseq->arg_post_len) > 0 && - argc == 1 && TYPE(argv[0]) == T_ARRAY) { - VALUE ary = argv[0]; + argc == 1 && !NIL_P(ary = rb_check_array_type(argv[0]))) { th->mark_stack_len = argc = RARRAY_LEN(ary); CHECK_STACK_OVERFLOW(th->cfp, argc); |