2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b113e3053..051ef54d39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Apr 27 23:57:04 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* eval.c (ruby_cleanup): add exception guard around code running
+	  signal handler (of r27513).  Absence of the guard made
+	  bootstraptest/test_thread.rb fail sometimes.
+
 Tue Apr 27 22:55:29 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* insns.def (onceinlinecache): add exclusion control for a region
diff --git a/eval.c b/eval.c
index 2db160c2ea..c16142b191 100644
--- a/eval.c
+++ b/eval.c
@@ -132,7 +132,11 @@ ruby_cleanup(volatile int ex)
 
     rb_threadptr_interrupt(th);
     rb_threadptr_check_signal(th);
-    RUBY_VM_CHECK_INTS();
+    PUSH_TAG();
+    if ((state = EXEC_TAG()) == 0) {
+	SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(); });
+    }
+    POP_TAG();
 
     errs[1] = th->errinfo;
     th->safe_level = 0;