merge revision(s) 34250:

	* gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore
	  an exception under rb_protect(). [ruby-dev:45113]


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

3 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 672c7c3675..3caf25997c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  7 13:59:26 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 Feb  6 15:34:47 2012  Tanaka Akira  <akr@fsij.org>
 
 	* ruby.c (fill_standard_fds): use fstat() instead of fcntl(F_GETFD)
diff --git a/gc.c b/gc.c
index 3238d6580a..5fd43cd82f 100644
--- a/gc.c
+++ b/gc.c
@@ -2918,7 +2918,10 @@ run_finalizer(rb_objspace_t *objspace, VALUE objid, 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);
     }
 }
 
diff --git a/version.h b/version.h
index c121db2f50..7ca43a035d 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 46
+#define RUBY_PATCHLEVEL 47
 
 #define RUBY_RELEASE_DATE "2012-02-07"
 #define RUBY_RELEASE_YEAR 2012