diff options
author | ayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-07 04:59:18 +0000 |
---|---|---|
committer | ayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-07 04:59:18 +0000 |
commit | cb94d9df62356a0437aafae9e56eddd033748db4 (patch) | |
tree | c566ae564d49911ed70f5ec9e545330ecab0fed2 /gc.c | |
parent | 04918f8156127d671ca207f14583e2e694476fde (diff) |
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
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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); } } |