ruby-changes:50762
From: usa <ko1@a...>
Date: Wed, 28 Mar 2018 14:48:53 +0900 (JST)
Subject: [ruby-changes:50762] usa:r62945 (ruby_2_3): merge revision(s) 57637: [Backport #14453]
usa 2018-03-28 14:48:48 +0900 (Wed, 28 Mar 2018) New Revision: 62945 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62945 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_3/ Modified files: branches/ruby_2_3/ChangeLog branches/ruby_2_3/version.h branches/ruby_2_3/win32/win32.c Index: ruby_2_3/version.h =================================================================== --- ruby_2_3/version.h (revision 62944) +++ ruby_2_3/version.h (revision 62945) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1 #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 Index: ruby_2_3/win32/win32.c =================================================================== --- ruby_2_3/win32/win32.c (revision 62944) +++ ruby_2_3/win32/win32.c (revision 62945) @@ -1507,7 +1507,7 @@ cmdglob(NtCmdLineElement *patt, NtCmdLin https://github.com/ruby/ruby/blob/trunk/ruby_2_3/win32/win32.c#L1507 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 *** https://github.com/ruby/ruby/blob/trunk/ruby_2_3/win32/win32.c#L1805 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_3/ChangeLog =================================================================== --- ruby_2_3/ChangeLog (revision 62944) +++ ruby_2_3/ChangeLog (revision 62945) @@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1 +Thu Mar 28 14:48:13 2018 Nobuyoshi Nakada <nobu@r...> + + 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@a...> check array for zsuper. [Bug #14279] Index: ruby_2_3 =================================================================== --- ruby_2_3 (revision 62944) +++ ruby_2_3 (revision 62945) Property changes on: ruby_2_3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r57637 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/