2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b118ecd4f..b6e5d64413 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 10 00:32:17 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore
+	  an exception under rb_protect(). [ruby-dev:45113]
+
 Mon Jan  9 23:37:43 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
 
 	* ext/readline/readline.c (readline_attempted_completion_function):
diff --git a/gc.c b/gc.c
index 67415b78e5..e6a7fcc330 100644
--- a/gc.c
+++ b/gc.c
@@ -3092,7 +3092,10 @@ run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table)
 	VALUE final = RARRAY_PTR(table)[i];
 	args[0] = RARRAY_PTR(final)[1];
 	args[2] = FIX2INT(RARRAY_PTR(final)[0]);
+	status = 0;
 	rb_protect(run_single_final, (VALUE)args, &status);
+	if (status)
+	    rb_set_errinfo(Qnil);
     }
 }