yugui	2011-05-30 13:43:46 +0900 (Mon, 30 May 2011)

  New Revision: 31811

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31811

  Log:
    merges r31314 from trunk into ruby_1_9_2.
    --
    * win32/win32.c (CreateChild): maximum length of lpCommandLine is
      32,768 characters, including the Unicode terminating null character.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/version.h
    branches/ruby_1_9_2/win32/win32.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31810)
+++ ruby_1_9_2/ChangeLog	(revision 31811)
@@ -1,3 +1,8 @@
+Thu Apr 21 01:01:28 2011  Masaya Tarui  <tarui@r...>
+
+	* win32/win32.c (CreateChild): maximum length of lpCommandLine is
+	  32,768 characters, including the Unicode terminating null character.
+	
 Sat Oct  9 16:54:28 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (RSHIFT): quote to get rid of argument expansion
Index: ruby_1_9_2/win32/win32.c
===================================================================
--- ruby_1_9_2/win32/win32.c	(revision 31810)
+++ ruby_1_9_2/win32/win32.c	(revision 31811)
@@ -1040,6 +1040,12 @@
 
     dwCreationFlags = (NORMAL_PRIORITY_CLASS);
 
+    if (lstrlenW(cmd) > 32767) {
+	child->pid = 0;		/* release the slot */
+	errno = E2BIG;
+	return NULL;
+    }
+
     RUBY_CRITICAL({
 	fRet = CreateProcess(prog, (char *)cmd, psa, psa,
 			     psa->bInheritHandle, dwCreationFlags, NULL, NULL,
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31810)
+++ ruby_1_9_2/version.h	(revision 31811)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 235
+#define RUBY_PATCHLEVEL 236
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/