From b348ed33442c6f3d946c0f1fc85820911a2faabe Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 20 Oct 2008 11:18:50 +0000 Subject: * error.c (exc_equal): should not compare recursively. [ruby-dev:36796] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ error.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1996c22dab..edccc55586 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 20 17:31:17 2008 Yukihiro Matsumoto + + * error.c (exc_equal): should not compare recursively. + [ruby-dev:36796] + Mon Oct 20 16:48:43 2008 Yukihiro Matsumoto * include/ruby/ruby.h (ExportStringValue): new macro to convert diff --git a/error.c b/error.c index db75ebd2c7..3248335b96 100644 --- a/error.c +++ b/error.c @@ -558,7 +558,7 @@ exc_equal(VALUE exc, VALUE obj) if (exc == obj) return Qtrue; if (rb_obj_class(exc) != rb_obj_class(obj)) - return rb_equal(obj, exc); + return Qfalse; CONST_ID(id_mesg, "mesg"); if (!rb_equal(rb_attr_get(exc, id_mesg), rb_attr_get(obj, id_mesg))) return Qfalse; -- cgit v1.2.3