diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-14 03:00:24 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-14 03:00:24 +0000 |
commit | f2aa0fd5d4ffa77a5c4bdd8698ac774b20540c62 (patch) | |
tree | 90fbd37e3bd6022c3c77a9a95b62b5025ace6b62 /error.c | |
parent | 1648e9442dd4a6824bef16f7a45e8cc927aef4f5 (diff) | |
download | ruby-f2aa0fd5d4ffa77a5c4bdd8698ac774b20540c62.tar.gz |
* error.c (exc_equal): ignore exceptions during implicit
conversion. [ruby-core:41979] [Bug #5865]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
-rw-r--r-- | error.c | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -713,6 +713,14 @@ exc_set_backtrace(VALUE exc, VALUE bt) return rb_iv_set(exc, "bt", rb_check_backtrace(bt)); } +static VALUE +try_convert_to_exception(VALUE obj) +{ + ID id_exception; + CONST_ID(id_exception, "exception"); + return rb_check_funcall(obj, id_exception, 0, 0); +} + /* * call-seq: * exc == obj -> true or false @@ -732,10 +740,14 @@ exc_equal(VALUE exc, VALUE obj) CONST_ID(id_mesg, "mesg"); if (rb_obj_class(exc) != rb_obj_class(obj)) { + int status = 0; ID id_message, id_backtrace; CONST_ID(id_message, "message"); CONST_ID(id_backtrace, "backtrace"); + obj = rb_protect(try_convert_to_exception, obj, &status); + if (status || obj == Qundef) 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; backtrace = rb_check_funcall(obj, id_backtrace, 0, 0); |