summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-20 11:18:50 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-20 11:18:50 +0000
commitdbd6605c4985655649d6e8fccf72b29ed09f5846 (patch)
treedc8d8c61f245740ae5e718829195737ee1a8e100
parent058836a711eeaf1b8f0fe4e1e3b266938c9d4689 (diff)
downloadruby-dbd6605c4985655649d6e8fccf72b29ed09f5846.tar.gz
ruby-dbd6605c4985655649d6e8fccf72b29ed09f5846.tar.xz
ruby-dbd6605c4985655649d6e8fccf72b29ed09f5846.zip
* error.c (exc_equal): should not compare recursively.
[ruby-dev:36796] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--error.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1996c22da..edccc5558 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 20 17:31:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * error.c (exc_equal): should not compare recursively.
+ [ruby-dev:36796]
+
Mon Oct 20 16:48:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* include/ruby/ruby.h (ExportStringValue): new macro to convert
diff --git a/error.c b/error.c
index db75ebd2c..3248335b9 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;