From a11c52812390fb7235a7c8a7f849e84a5cd58165 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 30 Dec 2008 10:31:51 +0000 Subject: merges r21163 from trunk into ruby_1_9_1. * vm.c (vm_set_eval_stack, vm_set_main_stack, vm_set_top_stack): check stack overflow. [ruby-dev:37646] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index b997d0f09..b85940655 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 29 16:16:20 2008 Koichi Sasada + + * vm.c (vm_set_eval_stack, vm_set_main_stack, vm_set_top_stack): + check stack overflow. [ruby-dev:37646] + Mon Dec 29 14:50:19 2008 Yuki Sonoda (Yugui) * Makefile.in (ext-clean): ext-clean always fails. diff --git a/vm.c b/vm.c index ddb736c08..2469d5ea4 100644 --- a/vm.c +++ b/vm.c @@ -77,6 +77,8 @@ vm_set_top_stack(rb_thread_t * th, VALUE iseqval) vm_push_frame(th, iseq, VM_FRAME_MAGIC_TOP, th->top_self, 0, iseq->iseq_encoded, th->cfp->sp, 0, iseq->local_size); + + CHECK_STACK_OVERFLOW(th->cfp, iseq->stack_max); } static void @@ -95,6 +97,8 @@ vm_set_eval_stack(rb_thread_t * th, VALUE iseqval, const NODE *cref) if (cref) { th->cfp->dfp[-1] = (VALUE)cref; } + + CHECK_STACK_OVERFLOW(th->cfp, iseq->stack_max); } static void @@ -116,6 +120,8 @@ vm_set_main_stack(rb_thread_t *th, VALUE iseqval) if (bind && iseq->local_size > 0) { bind->env = vm_make_env_object(th, th->cfp); } + + CHECK_STACK_OVERFLOW(th->cfp, iseq->stack_max); } rb_control_frame_t * -- cgit