Skip to content
This repository has been archived by the owner on Nov 18, 2021. It is now read-only.

Commit

Permalink
merge revision(s) 25656:
Browse files Browse the repository at this point in the history
	* win32/win32.c (CreateChild): allocate temporary buffer and use it
	  instead of directly modify the passed string.  [ruby-dev:39635]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@26113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
shyouhei committed Dec 16, 2009
1 parent 8e6ed32 commit bdc57dc
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
@@ -1,3 +1,8 @@
Wed Dec 16 20:17:40 2009 NAKAMURA Usaku <usa@ruby-lang.org>

* win32/win32.c (CreateChild): allocate temporary buffer and use it
instead of directly modify the passed string. [ruby-dev:39635]

Wed Dec 16 19:49:47 2009 URABE Shyouhei <shyouhei@ruby-lang.org>

* instruby.rb (with_destdir): revert. [ruby-dev:39885]
Expand Down
2 changes: 1 addition & 1 deletion version.h
Expand Up @@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-12-16"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20091216
#define RUBY_PATCHLEVEL 241
#define RUBY_PATCHLEVEL 242

#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
Expand Down
12 changes: 7 additions & 5 deletions win32/win32.c
Expand Up @@ -1066,11 +1066,13 @@ CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa,
}
}
if (p) {
shell = p;
while (*p) {
if ((unsigned char)*p == '/')
*p = '\\';
p = CharNext(p);
char *tmp = ALLOCA_N(char, strlen(p) + 1);
strcpy(tmp, p);
shell = tmp;
while (*tmp) {
if ((unsigned char)*tmp == '/')
*tmp = '\\';
tmp = CharNext(tmp);
}
}

Expand Down

0 comments on commit bdc57dc

Please sign in to comment.