From 1c411796ef50c6e4da9f0628d12816219d5f864a Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 11 Mar 2008 07:43:55 +0000 Subject: * win32/win32.c (rb_w32_cmdvector): terminate shrunken command line. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ win32/win32.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index acde120374..5e1f255401 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Mar 11 16:43:53 2008 Nobuyoshi Nakada + + * win32/win32.c (rb_w32_cmdvector): terminate shrunken command line. + Tue Mar 11 12:39:03 2008 Nobuyoshi Nakada * common.mk (clean-local): removes MINOBJS. diff --git a/win32/win32.c b/win32/win32.c index b602a49116..391d3a5ffa 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1424,9 +1424,10 @@ rb_w32_cmdvector(const char *cmd, char ***vec) ptr = buffer + (elements+1) * sizeof(char *); while (curr = cmdhead) { - memcpy(ptr, curr->str, curr->len + 1); + memcpy(ptr, curr->str, curr->len); *vptr++ = ptr; - ptr += curr->len + 1; + ptr += curr->len; + *ptr++ = '\0'; cmdhead = curr->next; if (curr->flags & NTMALLOC) free(curr->str); free(curr); -- cgit v1.2.3