aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-04 10:19:55 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-04 10:19:55 +0000
commita110ef359aea39502990eba1a01952411b55cda7 (patch)
treee3a318c59e5da93ff7d091cfda9a158de6b8d7bb
parentf8c5b8ec90cec4a8db42bd07f97c475ba6353b10 (diff)
downloadruby-a110ef359aea39502990eba1a01952411b55cda7.tar.gz
* hash.c (hash_equal): two hash tables are different when internal
comparison table differ. [ruby-dev:33989] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15688 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog3
-rw-r--r--hash.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bc621bd86..8c68fc07b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Tue Mar 4 19:10:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (rb_hash_aset): should not copy key string when
compare_by_identity is set. [ruby-dev:33604]
+ * hash.c (hash_equal): two hash tables are different when internal
+ comparison table differ. [ruby-dev:33989]
+
Tue Mar 4 16:29:06 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (parser_yylex): disallow non digits '0o' expression.
diff --git a/hash.c b/hash.c
index 3b74b8c20b..2cb7270304 100644
--- a/hash.c
+++ b/hash.c
@@ -1397,6 +1397,8 @@ hash_equal(VALUE hash1, VALUE hash2, int eql)
return Qfalse;
if (!RHASH(hash1)->ntbl || !RHASH(hash2)->ntbl)
return Qtrue;
+ if (RHASH(hash1)->ntbl->type != RHASH(hash2)->ntbl->type)
+ return Qfalse;
#if 0
if (!(rb_equal(RHASH(hash1)->ifnone, RHASH(hash2)->ifnone) &&
FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))