From 05292160489699688687dc2d2576873cddac5437 Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 21 Mar 2018 14:26:48 +0000 Subject: 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_4@62874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- version.h | 2 +- win32/win32.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/version.h b/version.h index 780581c0c7..6c44937809 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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 diff --git a/win32/win32.c b/win32/win32.c index 7e8afb2ddc..068784e149 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1565,7 +1565,7 @@ cmdglob(NtCmdLineElement *patt, NtCmdLineElement **tail, UINT cp, rb_encoding *e 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 ***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; -- cgit v1.2.3