From 17eef070da74f51a4bf6ac53d0dd58042ec4eb6c Mon Sep 17 00:00:00 2001
From: Gilad Zohari <gzohari@gmail.com>
Date: Fri, 3 May 2013 23:36:02 +0300
Subject: add type check in Hash#merge!

---
 mrbgems/mruby-hash-ext/mrblib/hash.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mrbgems/mruby-hash-ext/mrblib/hash.rb b/mrbgems/mruby-hash-ext/mrblib/hash.rb
index 3e1bac0a2..3fb83abba 100644
--- a/mrbgems/mruby-hash-ext/mrblib/hash.rb
+++ b/mrbgems/mruby-hash-ext/mrblib/hash.rb
@@ -1,5 +1,6 @@
 class Hash
   def merge!(other, &block)
+    raise "can't convert argument into Hash" unless other.respond_to?(:to_hash)
     if block
       other.each_key{|k|
         self[k] = (self.has_key?(k))? block.call(k, self[k], other[k]): other[k]
-- 
cgit v1.2.3