diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | hash.c | 1 | ||||
| -rw-r--r-- | test/ruby/test_hash.rb | 3 |
3 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Aug 2 12:03:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * hash.c (recursive_hash): hash value of emptied hash should be + equal to an empty hash. [ruby-core:38650] + Tue Aug 2 11:42:15 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (rb_enc_symname2_p): :! is valid symbol. [Bug #5136] @@ -1685,6 +1685,7 @@ recursive_hash(VALUE hash, VALUE dummy, int recur) if (!RHASH(hash)->ntbl) return LONG2FIX(0); hval = RHASH(hash)->ntbl->num_entries; + if (!hval) return LONG2FIX(0); if (recur) hval = rb_hash_uint(rb_hash_start(rb_hash(rb_cHash)), hval); else diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 82aba92529..82272cb301 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -809,6 +809,9 @@ class TestHash < Test::Unit::TestCase def test_hash2 assert_kind_of(Integer, {}.hash) + h = {1=>2} + h.shift + assert_equal({}.hash, h.hash, '[ruby-core:38650]') end def test_update2 |