Merge pull request #1832 from ksss/fix-1823

fix #1823

1 files changed, 6 insertions, 3 deletions

diff --git a/src/hash.c b/src/hash.c
index af3571eaf..34cc15131 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -874,6 +874,7 @@ static mrb_value
 hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, mrb_bool eql)
 {
   khash_t(ht) *h1, *h2;
+  mrb_bool eq;
 
   if (mrb_obj_equal(mrb, hash1, hash2)) return mrb_true_value();
   if (!mrb_hash_p(hash2)) {
@@ -881,8 +882,6 @@ hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, mrb_bool eql)
           return mrb_false_value();
       }
       else {
-        mrb_bool eq;
-
         if (eql) {
           eq = mrb_eql(mrb, hash2, hash1);
         }
@@ -908,7 +907,11 @@ hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, mrb_bool eql)
       key = kh_key(h1,k1);
       k2 = kh_get(ht, mrb, h2, key);
       if (k2 != kh_end(h2)) {
-        if (mrb_eql(mrb, kh_value(h1,k1), kh_value(h2,k2))) {
+        if (eql)
+          eq = mrb_eql(mrb, kh_value(h1,k1), kh_value(h2,k2));
+        else
+          eq = mrb_equal(mrb, kh_value(h1,k1), kh_value(h2,k2));
+        if (eq) {
           continue; /* next key */
         }
       }