merge revision(s) 25670:

	* eval.c (call_trace_func): remove the trace hook if any exception
	  raised.  [ruby-list:46515]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 1 deletions

diff --git a/eval.c b/eval.c
index 2541e2e2e7..24267b033e 100644
--- a/eval.c
+++ b/eval.c
@@ -2772,7 +2772,11 @@ call_trace_func(event, node, self, id, klass)
     tracing = 0;
     ruby_current_node = node_save;
     SET_CURRENT_SOURCE();
-    if (state) JUMP_TAG(state);
+    if (state) {
+	trace_func = 0;
+	rb_remove_event_hook(call_trace_func);
+	JUMP_TAG(state);
+    }
 }
 
 static VALUE