aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-27 11:28:18 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-27 11:28:18 +0000
commit39c2cf2c8195e90e8a888138e7c2b96b2ed2718b (patch)
treef7046d5c2ce0f3a301fb64b0cb5e7cdabf175f81
parentd5108ed27723660d8d0fcc8a88f415d02522e53e (diff)
downloadruby-39c2cf2c8195e90e8a888138e7c2b96b2ed2718b.tar.gz
* win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size
is 2, not 0, because it will be converted to "". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 33ee7921fe..bf085bb0c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 27 20:26:59 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size
+ is 2, not 0, because it will be converted to "".
+
Sat Dec 27 19:40:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (after_exec): needs to reset before restart timer
diff --git a/win32/win32.c b/win32/win32.c
index d346a925d6..316b69b873 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -715,7 +715,7 @@ rb_w32_argv_size(char *const *argv)
}
}
len += p - *t + n + 1;
- if (quote) len += 2;
+ if (p - *t == 0 || quote) len += 2;
}
return len;
}