nagachika	2018-03-21 23:26:48 +0900 (Wed, 21 Mar 2018)

  New Revision: 62874

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62874

  Log:
    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.

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/version.h
    branches/ruby_2_4/win32/win32.c
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 62873)
+++ ruby_2_4/version.h	(revision 62874)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.4"
 #define RUBY_RELEASE_DATE "2018-03-21"
-#define RUBY_PATCHLEVEL 277
+#define RUBY_PATCHLEVEL 278
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/win32/win32.c
===================================================================
--- ruby_2_4/win32/win32.c	(revision 62873)
+++ ruby_2_4/win32/win32.c	(revision 62874)
@@ -1565,7 +1565,7 @@ cmdglob(NtCmdLineElement *patt, NtCmdLin https://github.com/ruby/ruby/blob/trunk/ruby_2_4/win32/win32.c#L1565
     if (patt->len >= PATH_MAX)
 	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);
@@ -1863,7 +1863,8 @@ w32_cmdvector(const WCHAR *cmd, char *** https://github.com/ruby/ruby/blob/trunk/ruby_2_4/win32/win32.c#L1863
     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;
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 62873)
+++ ruby_2_4	(revision 62874)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r57637

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/