From b9a9a024094026ee5151de237c4d2ae8111ddc03 Mon Sep 17 00:00:00 2001 From: glass Date: Fri, 12 Jul 2013 02:22:01 +0000 Subject: * hash.c (recursive_hash): use RHASH_SIZE() to check hash size. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ hash.c | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 262ddc7c35..2f692f2651 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Jul 12 11:17:41 2013 Masaki Matsushita + + * hash.c (recursive_hash): use RHASH_SIZE() to check hash size. + Fri Jul 12 00:20:00 2013 Masaki Matsushita * hash.c (rb_hash_size): use RHASH_SIZE(). diff --git a/hash.c b/hash.c index 7997b2e681..95fea9e96d 100644 --- a/hash.c +++ b/hash.c @@ -1869,12 +1869,9 @@ hash_i(VALUE key, VALUE val, VALUE arg) static VALUE recursive_hash(VALUE hash, VALUE dummy, int recur) { - st_index_t hval; + st_index_t hval = RHASH_SIZE(hash); - if (!RHASH(hash)->ntbl) - return LONG2FIX(0); - hval = RHASH(hash)->ntbl->num_entries; - if (!hval) return LONG2FIX(0); + if (!hval) return INT2FIX(0); if (recur) hval = rb_hash_uint(rb_hash_start(rb_hash(rb_cHash)), hval); else -- cgit v1.2.3