archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 18:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r31314 from trunk into ruby_1_9_2.

Browse source 
--
	* win32/win32.c (CreateChild): maximum length of lpCommandLine is
	  32,768 characters, including the Unicode terminating null character.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-30 04:43:46 +00:00
parent b79b4492ae
commit 86692258b0
3 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Apr 21 01:01:28 2011 Masaya Tarui <tarui@ruby-lang.org>
* 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@ruby-lang.org> Sat Oct 9 16:54:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RSHIFT): quote to get rid of argument expansion * configure.in (RSHIFT): quote to get rid of argument expansion

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 235 #define RUBY_PATCHLEVEL 236
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1

6
win32/win32.c
View file

@ -1040,6 +1040,12 @@ CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa,
dwCreationFlags = (NORMAL_PRIORITY_CLASS); dwCreationFlags = (NORMAL_PRIORITY_CLASS);
if (lstrlenW(cmd) > 32767) {
child->pid = 0; /* release the slot */
errno = E2BIG;
return NULL;
}
RUBY_CRITICAL({ RUBY_CRITICAL({
fRet = CreateProcess(prog, (char *)cmd, psa, psa, fRet = CreateProcess(prog, (char *)cmd, psa, psa,
psa->bInheritHandle, dwCreationFlags, NULL, NULL, psa->bInheritHandle, dwCreationFlags, NULL, NULL,