From 31a3a862d6bd87817e494d60c3e8eb8a1025e5d2 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 14 Apr 2016 05:58:16 +0000
Subject: tkutil.c: ary can be nil

* ext/tk/tkutil/tkutil.c (tk_hash_kv): the third argument can be
  nil not only an Array.  reported by @windwiny at
  https://github.com/ruby/ruby/commit/cdaa94e#commitcomment-17096618

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/tkutil/tkutil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext')

diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c
index 3b1d3c5ecf..249ed57448 100644
--- a/ext/tk/tkutil/tkutil.c
+++ b/ext/tk/tkutil/tkutil.c
@@ -804,7 +804,7 @@ tk_hash_kv(argc, argv, self)
     switch(argc) {
     case 3:
         ary = argv[2];
-	Check_Type(ary, T_ARRAY);
+	if (!NIL_P(ary)) Check_Type(ary, T_ARRAY);
     case 2:
         enc_flag = argv[1];
     case 1:
-- 
cgit v1.2.3