summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-24 08:55:17 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-24 08:55:17 +0000
commitf2074245b4c4d712cb74716c680d876eda9b8789 (patch)
treea8e61723a1d797a05066dc86d5c205c77ff1e540 /vm.c
parentadc677eb5cd3aed1986c3316d5b98ed942f544d5 (diff)
* insns.def, vm.c: add/fix stack overflow check.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vm.c b/vm.c
index f4e37d28a7..487797818c 100644
--- a/vm.c
+++ b/vm.c
@@ -871,7 +871,7 @@ th_yield_setup_args(rb_thread_t *th, rb_iseq_t *iseq,
VALUE ary = argv[0];
th->mark_stack_len = argc = RARRAY_LEN(ary);
- /* TODO: check overflow */
+ CHECK_STACK_OVERFLOW(th->cfp, argc);
for (i=0; i<argc; i++) {
argv[i] = RARRAY_PTR(ary)[i];
@@ -906,7 +906,6 @@ th_yield_setup_args(rb_thread_t *th, rb_iseq_t *iseq,
argc, iseq->argc);
}
else {
- /* TODO: check overflow */
for (i=argc; i<r; i++) {
argv[i] = Qnil;
}
@@ -946,7 +945,8 @@ invoke_block(rb_thread_t *th, rb_block_t *block, VALUE self, int argc, VALUE *ar
th_set_finish_env(th);
- /* TODO: check overflow */
+ CHECK_STACK_OVERFLOW(th->cfp, argc);
+ CHECK_STACK_OVERFLOW(th->cfp, iseq->stack_max);
for (i=0; i<argc; i++) {
th->cfp->sp[i] = argv[i];