diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-16 02:47:21 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-16 02:47:21 +0000 |
commit | f2d307f7749d22369beb9010768631eb25fb6513 (patch) | |
tree | effd2de1447d5cd1b7e558c2c80be1feb84eb244 /win32/win32.c | |
parent | b0f79f626d5d562e961c865b6c85009c01747ce4 (diff) | |
download | ruby-f2d307f7749d22369beb9010768631eb25fb6513.tar.gz |
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/trunk@57637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.c')
-rw-r--r-- | win32/win32.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/win32/win32.c b/win32/win32.c index 385bda64c9..19513ab69d 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1566,7 +1566,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); @@ -1864,7 +1864,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; |