From ca016c705fbe58d254daaaacc123a70c78caadcb Mon Sep 17 00:00:00 2001 From: ktsj Date: Tue, 5 Feb 2013 15:55:41 +0000 Subject: * vm.c (rb_vm_stack_to_heap): call rb_vm_get_binding_creatable_next_cfp instead of rb_vm_get_ruby_level_next_cfp to prevent a segfault by calling Kernel#callcc. See r39067 for more details. [ruby-dev:46908] [ruby-trunk - Bug #7774] * test/ruby/test_settracefunc.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vm.c') diff --git a/vm.c b/vm.c index 698857ba33..36def2cfae 100644 --- a/vm.c +++ b/vm.c @@ -553,7 +553,7 @@ void rb_vm_stack_to_heap(rb_thread_t *th) { rb_control_frame_t *cfp = th->cfp; - while ((cfp = rb_vm_get_ruby_level_next_cfp(th, cfp)) != 0) { + while ((cfp = rb_vm_get_binding_creatable_next_cfp(th, cfp)) != 0) { rb_vm_make_env_object(th, cfp); cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); } -- cgit v1.2.3