diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-14 09:36:18 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-14 09:36:18 +0000 |
commit | 15e1ff7f2398f03d392fb1aeea355c124dfa4874 (patch) | |
tree | 1ce4b9ea42d0122a327a5b6a5183760a90ee0e2f /error.c | |
parent | c53470fd47fa62eed38af281017e10a41ef8ff2a (diff) | |
download | bundler-15e1ff7f2398f03d392fb1aeea355c124dfa4874.tar.gz |
* error.c (exc_equal): clear rb_thread_t::errinfo when ignore
an exception under rb_protect(). [ruby-core:41979] [Bug #5865]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
-rw-r--r-- | error.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -746,7 +746,10 @@ exc_equal(VALUE exc, VALUE obj) CONST_ID(id_backtrace, "backtrace"); obj = rb_protect(try_convert_to_exception, obj, &status); - if (status || obj == Qundef) return Qfalse; + if (status || obj == Qundef) { + rb_set_errinfo(Qnil); + return Qfalse; + } if (rb_obj_class(exc) != rb_obj_class(obj)) return Qfalse; mesg = rb_check_funcall(obj, id_message, 0, 0); if (mesg == Qundef) return Qfalse; |