From 50b840c9de7a0a37d42742a53757f2e74447c053 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Thu, 30 Aug 2018 22:18:27 +0900
Subject: Use `mrb_ensure_hash_type()` to check if an operand is a `Hash`; fix
 #4097

---
 src/vm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/vm.c b/src/vm.c
index 98e554607..77d9316d4 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -2720,10 +2720,11 @@ RETRY_TRY_BLOCK:
     }
 
     CASE(OP_HASHADD, BB) {
-      mrb_value hash = regs[a];
+      mrb_value hash;
       int i;
       int lim = a+b*2+1;
 
+      hash = mrb_ensure_hash_type(mrb, regs[a]);
       for (i=a+1; i<lim; i+=2) {
         mrb_hash_set(mrb, hash, regs[i], regs[i+1]);
       }
@@ -2731,7 +2732,9 @@ RETRY_TRY_BLOCK:
       NEXT;
     }
     CASE(OP_HASHCAT, B) {
-      mrb_hash_merge(mrb, regs[a], regs[a+1]);
+      mrb_value hash = mrb_ensure_hash_type(mrb, regs[a]);
+
+      mrb_hash_merge(mrb, hash, regs[a+1]);
       mrb_gc_arena_restore(mrb, ai);
       NEXT;
     }
-- 
cgit v1.2.3