From cf5ef3db5e33195ef8cbf5288456f60c6d90f75c Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 7 Nov 2013 00:39:56 +0000
Subject: vm_trace.c: isolate errinfo in trace blocks

* vm_trace.c (rb_threadptr_exec_event_hooks_orig): errinfo should not
  be propagated to trace blocks so that no argument raise does not
  throw internal objects.  [ruby-dev:47793] [Bug #9088]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 vm_trace.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'vm_trace.c')

diff --git a/vm_trace.c b/vm_trace.c
index ce078ca162..a96e733741 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -294,6 +294,7 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p)
 	const int outer_state = th->state;
 	int state = 0;
 	th->state = 0;
+	th->errinfo = Qnil;
 
 	th->vm->trace_running++;
 	th->trace_arg = trace_arg;
-- 
cgit v1.2.3