From cb94d9df62356a0437aafae9e56eddd033748db4 Mon Sep 17 00:00:00 2001
From: ayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 7 Feb 2012 04:59:18 +0000
Subject: 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
---
 gc.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gc.c')

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);
     }
 }
 
-- 
cgit v1.2.3