diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-09 15:35:06 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-09 15:35:06 +0000 |
commit | fcb05d868316ebee7750537dea40e9de584aabf3 (patch) | |
tree | 3b7de66a91b0932a2881dbbe84089c31d11f788c | |
parent | d4b2957781b4582ae1f9571b25226a6a074d6a32 (diff) | |
download | ruby-fcb05d868316ebee7750537dea40e9de584aabf3.tar.gz |
* 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/trunk@34250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | gc.c | 3 |
2 files changed, 8 insertions, 0 deletions
@@ -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): @@ -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); } } |