diff options
author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-31 02:57:18 +0000 |
---|---|---|
committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-31 02:57:18 +0000 |
commit | 31013d0f111084de2a67a05b56967f158c84335c (patch) | |
tree | a2aa33fa988f12a8ba686b82db1f5da19c0a13e2 /vm.c | |
parent | 1c8fd014498e827389d034d28af572b74a899686 (diff) |
* backport r32768 from trunk.
* vm.c: check if cfp is valid. [Bug #5083] [ruby-dev:44208]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -854,6 +854,10 @@ rb_vm_cref(void) { rb_thread_t *th = GET_THREAD(); rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp); + + if (cfp == 0) { + rb_raise(rb_eRuntimeError, "Can't call on top of Fiber or Thread"); + } return vm_get_cref(cfp->iseq, cfp->lfp, cfp->dfp); } @@ -875,6 +879,9 @@ rb_vm_cbase(void) rb_thread_t *th = GET_THREAD(); rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp); + if (cfp == 0) { + rb_raise(rb_eRuntimeError, "Can't call on top of Fiber or Thread"); + } return vm_get_cbase(cfp->iseq, cfp->lfp, cfp->dfp); } @@ -1971,6 +1978,10 @@ m_core_set_postexe(VALUE self, VALUE iseqval) rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp); VALUE proc; + if (cfp == 0) { + rb_bug("m_core_set_postexe: unreachable"); + } + GetISeqPtr(iseqval, blockiseq); blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(cfp); |