kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

vm.c: fix infinite loop

Browse source 
* vm.c: use EXEC_EVENT_HOOK_AND_POP_FRAME. While exception handling, if an exception
  is raised in hooks, need to pop current frame and raise this raised exception by hook.

[ruby-dev:50582] [Bug #14865]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ktsj 2018-06-23 04:52:58 +00:00
parent 3b51b2fa96
commit 289dcb30b9
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test/ruby/test_settracefunc.rb
View file

@ -896,6 +896,21 @@ class TestSetTraceFunc < Test::Unit::TestCase
end end
end end
def test_tracepoint_exception_at_c_return
assert_nothing_raised(Timeout::Error, 'infinite trace') do
assert_normal_exit %q{
begin
TracePoint.new(:c_return){|tp|
raise
}.enable{
tap{ itself }
}
rescue
end
}, '', timeout: 3
end
end
def test_tracepoint_with_multithreads def test_tracepoint_with_multithreads
assert_nothing_raised do assert_nothing_raised do
TracePoint.new{ TracePoint.new{

8
vm.c
View file

@ -1846,10 +1846,10 @@ vm_exec_handle_exception(rb_execution_context_t *ec, enum ruby_tag_type state,
while (ec->cfp->pc == 0 || ec->cfp->iseq == 0) { while (ec->cfp->pc == 0 || ec->cfp->iseq == 0) {
if (UNLIKELY(VM_FRAME_TYPE(ec->cfp) == VM_FRAME_MAGIC_CFUNC)) { if (UNLIKELY(VM_FRAME_TYPE(ec->cfp) == VM_FRAME_MAGIC_CFUNC)) {
EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, ec->cfp->self, EXEC_EVENT_HOOK_AND_POP_FRAME(ec, RUBY_EVENT_C_RETURN, ec->cfp->self,
rb_vm_frame_method_entry(ec->cfp)->def->original_id, rb_vm_frame_method_entry(ec->cfp)->def->original_id,
rb_vm_frame_method_entry(ec->cfp)->called_id, rb_vm_frame_method_entry(ec->cfp)->called_id,
rb_vm_frame_method_entry(ec->cfp)->owner, Qnil); rb_vm_frame_method_entry(ec->cfp)->owner, Qnil);
RUBY_DTRACE_CMETHOD_RETURN_HOOK(ec, RUBY_DTRACE_CMETHOD_RETURN_HOOK(ec,
rb_vm_frame_method_entry(ec->cfp)->owner, rb_vm_frame_method_entry(ec->cfp)->owner,
rb_vm_frame_method_entry(ec->cfp)->def->original_id); rb_vm_frame_method_entry(ec->cfp)->def->original_id);