diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-30 10:31:51 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-30 10:31:51 +0000 |
| commit | a11c52812390fb7235a7c8a7f849e84a5cd58165 (patch) | |
| tree | 33b5bb2d6d6a8b77059f73177cf780cd17b2e866 /vm.c | |
| parent | be4a9a413ebf53d7f588073ec02e09263b8d3432 (diff) | |
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
Diffstat (limited to 'vm.c')
| -rw-r--r-- | vm.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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 * |