From 99299e1961202fa396def185f4db2d6f4711dce3 Mon Sep 17 00:00:00 2001
From: wanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 21 Jun 2010 14:43:58 +0000
Subject: * eval_error.c (error_print): clear raised_flag while error-printing 
  to avoid hang. [ruby-core:27608]

* test/ruby/test_beginendblock.rb (test_endblock_raise): add test for
  above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28368 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 eval_error.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'eval_error.c')

diff --git a/eval_error.c b/eval_error.c
index 46a0705f4a..41fcbb0abb 100644
--- a/eval_error.c
+++ b/eval_error.c
@@ -67,13 +67,16 @@ static void
 error_print(void)
 {
     volatile VALUE errat = Qnil;		/* OK */
-    VALUE errinfo = GET_THREAD()->errinfo;
+    rb_thread_t *th = GET_THREAD();
+    VALUE errinfo = th->errinfo;
+    int raised_flag = th->raised_flag;
     volatile VALUE eclass, e;
     const char *volatile einfo;
     volatile long elen;
 
     if (NIL_P(errinfo))
 	return;
+    rb_thread_raised_clear(th);
 
     PUSH_TAG();
     if (EXEC_TAG() == 0) {
@@ -179,6 +182,7 @@ error_print(void)
     }
   error:
     POP_TAG();
+    rb_thread_raised_set(th, raised_flag);
 }
 
 void
-- 
cgit v1.2.3