summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authorktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-31 02:32:48 +0000
committerktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-31 02:32:48 +0000
commit70189a8cfd0e06230984b1033635d532c543e39d (patch)
tree3ea652e8dff9c95fb562b3622bc74f7d5882bc86 /vm.c
parent89b601d176a64f1293a3d3b5195b6735cbf880af (diff)
* vm.c: check if cfp is valid. [Bug #5083] [ruby-dev:44208]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/vm.c b/vm.c
index 3c1e8b4113..3f2b52420f 100644
--- a/vm.c
+++ b/vm.c
@@ -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);