Browse files

* 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
  • Loading branch information...
1 parent c53470f commit 15e1ff7f2398f03d392fb1aeea355c124dfa4874 @nagachika nagachika committed Jan 14, 2012
Showing with 28 additions and 1 deletion.
  1. +5 −0 ChangeLog
  2. +4 −1 error.c
  3. +19 −0 test/ruby/test_exception.rb
View
5 ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 14 18:24:13 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+
+ * error.c (exc_equal): clear rb_thread_t::errinfo when ignore
+ an exception under rb_protect(). [ruby-core:41979] [Bug #5865]
+
Sat Jan 14 12:02:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_enc_vsprintf): relaxed the restriction. since the
View
5 error.c
@@ -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;
View
19 test/ruby/test_exception.rb
@@ -379,11 +379,30 @@ def test_exception_in_name_error_to_str
assert_nothing_raised(NameError, bug5575) do
load(t.path)
end
+ ensure
+ t.close(true) if t
end
def test_equal
bug5865 = '[ruby-core:41979]'
assert_equal(RuntimeError.new("a"), RuntimeError.new("a"), bug5865)
assert_not_equal(RuntimeError.new("a"), StandardError.new("a"), bug5865)
end
+
+ def test_exception_in_exception_equal
+ bug5865 = '[ruby-core:41979]'
+ t = Tempfile.new(["test_exception_in_exception_equal", ".rb"])
+ t.puts <<-EOC
+ o = Object.new
+ def o.exception(arg)
+ end
+ RuntimeError.new("a") == o
+ EOC
+ t.close
+ assert_nothing_raised(ArgumentError, bug5865) do
+ load(t.path)
+ end
+ ensure
+ t.close(true) if t
+ end
end

0 comments on commit 15e1ff7

Please sign in to comment.