From 70189a8cfd0e06230984b1033635d532c543e39d Mon Sep 17 00:00:00 2001 From: ktsj Date: Sun, 31 Jul 2011 02:32:48 +0000 Subject: * 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 --- ChangeLog | 4 ++++ test/ruby/test_thread.rb | 12 ++++++++++++ vm.c | 11 +++++++++++ 3 files changed, 27 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6ede87c7ac..940453d7d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jul 31 11:31:07 2011 Kazuki Tsujimoto + + * vm.c: check if cfp is valid. [Bug #5083] [ruby-dev:44208] + Sun Jul 31 09:18:28 2011 Eric Hodel * lib/rdoc: Update to RDoc 3.9. Fixed `ri []`, stopdoc creating an diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index daccadde78..c16aa87896 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -604,6 +604,18 @@ class TestThread < Test::Unit::TestCase end INPUT end + + def test_no_valid_cfp + bug5083 = '[ruby-dev:44208]' + error = assert_raise(RuntimeError) do + Thread.new(&Module.method(:nesting)).join + end + assert_equal("Can't call on top of Fiber or Thread", error.message, bug5083) + error = assert_raise(RuntimeError) do + Thread.new(:to_s, &Module.method(:undef_method)).join + end + assert_equal("Can't call on top of Fiber or Thread", error.message, bug5083) + end end class TestThreadGroup < Test::Unit::TestCase 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); -- cgit v1.2.3