Need to check if merging hash is empty; fix #4107

0b44e802 · Yukihiro "Matz" Matsumoto · 4cd4c642 · 0b44e802
Commit 0b44e802 authored Sep 06, 2018 by Yukihiro "Matz" Matsumoto
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

src/hash.c src/hash.c +1 -0

No files found.
--- a/src/hash.c
+++ b/src/hash.c
@@ -969,6 +969,7 @@ mrb_hash_merge(mrb_state *mrb, mrb_value hash1, mrb_value hash2)
  h1 = RHASH_TBL(hash1);
  h2 = RHASH_TBL(hash2);
+  if (!h2) return;
  if (!h1) {
    RHASH_TBL(hash1) = kh_copy(ht, mrb, h2);
    return;