merge revision(s) 57637: [Backport #14453]

	win32.c: memcpy instead of strlcpy

	* win32/win32.c (cmdglob): memcpy the exact size instead of
	  strlcpy with +1.

	* win32/win32.c (w32_cmdvector): ditto, with NUL-terminating.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 570c61f50e..4e8cb1e8f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Mar 28 14:48:13 2018  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	win32.c: memcpy instead of strlcpy
+
+	* win32/win32.c (cmdglob): memcpy the exact size instead of
+	  strlcpy with +1.
+
+	* win32/win32.c (w32_cmdvector): ditto, with NUL-terminating.
+
 Mon Mar 28 14:45:02 2018  Koichi Sasada  <ko1@atdot.net>
 
 	check array for zsuper. [Bug #14279]
diff --git a/version.h b/version.h
index 3836ea9f1c..11cd402ad8 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.7"
 #define RUBY_RELEASE_DATE "2018-03-28"
-#define RUBY_PATCHLEVEL 441
+#define RUBY_PATCHLEVEL 442
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
diff --git a/win32/win32.c b/win32/win32.c
index 9c25c939f1..6853ae367b 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1507,7 +1507,7 @@ cmdglob(NtCmdLineElement *patt, NtCmdLineElement **tail, UINT cp, rb_encoding *e
     if (patt->len >= MAXPATHLEN)
 	if (!(buf = malloc(patt->len + 1))) return 0;
 
-    strlcpy(buf, patt->str, patt->len + 1);
+    memcpy(buf, patt->str, patt->len);
     buf[patt->len] = '\0';
     translate_char(buf, '\\', '/', cp);
     status = ruby_brace_glob_with_enc(buf, 0, insert, (VALUE)&tail, enc);
@@ -1805,7 +1805,8 @@ w32_cmdvector(const WCHAR *cmd, char ***vec, UINT cp, rb_encoding *enc)
     cptr = buffer + (elements+1) * sizeof(char *);
 
     while ((curr = cmdhead) != 0) {
-	strlcpy(cptr, curr->str, curr->len + 1);
+	memcpy(cptr, curr->str, curr->len);
+	cptr[curr->len] = '\0';
 	*vptr++ = cptr;
 	cptr += curr->len + 1;
 	cmdhead = curr->next;