From a110ef359aea39502990eba1a01952411b55cda7 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 4 Mar 2008 10:19:55 +0000 Subject: [PATCH] * 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 --- ChangeLog | 3 +++ hash.c | 2 ++ 2 files changed, 5 insertions(+) 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 * 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 * 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)))