kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

win32.c: acp_to_wstr results check

Browse source 
* win32/win32.c (rb_w32_spawn, rb_w32_aspawn_flags): check the results
  of acp_to_wstr() which can return NULL.  [ruby-core:51557] [Bug #7721]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-01-23 03:28:25 +00:00
parent a99615af02
commit fa30ebc3c7
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jan 23 12:28:22 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_spawn, rb_w32_aspawn_flags): check the results
of acp_to_wstr() which can return NULL. [ruby-core:51557] [Bug #7721]
Wed Jan 23 10:40:49 2013 Eric Hodel <drbrain@segment7.net>
* doc/syntax/assignment.rdoc (Implicit Array Assignment): Clarify

24
win32/win32.c
View file

@ -1182,7 +1182,8 @@ rb_w32_spawn(int mode, const char *cmd, const char *prog)
char fbuf[MAXPATHLEN];
char *p = NULL;
const char *shell = NULL;
WCHAR *wcmd, *wshell;
WCHAR *wcmd = NULL, *wshell = NULL;
int e = 0;
rb_pid_t ret;
VALUE v = 0;
VALUE v2 = 0;
@ -1267,14 +1268,17 @@ rb_w32_spawn(int mode, const char *cmd, const char *prog)
}
/* assume ACP */
wcmd = cmd ? acp_to_wstr(cmd, NULL) : NULL;
if (!e && cmd && !(wcmd = acp_to_wstr(cmd, NULL))) e = E2BIG;
if (v) ALLOCV_END(v);
wshell = shell ? acp_to_wstr(shell, NULL) : NULL;
if (!e && shell && !(wshell = acp_to_wstr(shell, NULL))) e = E2BIG;
if (v2) ALLOCV_END(v2);
ret = child_result(CreateChild(wcmd, wshell, NULL, NULL, NULL, NULL, 0), mode);
if (!e) {
ret = child_result(CreateChild(wcmd, wshell, NULL, NULL, NULL, NULL, 0), mode);
}
free(wshell);
free(wcmd);
if (e) errno = e;
return ret;
}
@ -1287,7 +1291,8 @@ rb_w32_aspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags)
BOOL ntcmd = FALSE, tmpnt;
const char *shell;
char *cmd, fbuf[MAXPATHLEN];
WCHAR *wcmd, *wprog;
WCHAR *wcmd = NULL, *wprog = NULL;
int e = 0;
rb_pid_t ret;
VALUE v = 0;
@ -1335,13 +1340,16 @@ rb_w32_aspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags)
}
/* assume ACP */
wcmd = cmd ? acp_to_wstr(cmd, NULL) : NULL;
if (!e && cmd && !(wcmd = acp_to_wstr(cmd, NULL))) e = E2BIG;
if (v) ALLOCV_END(v);
wprog = prog ? acp_to_wstr(prog, NULL) : NULL;
if (!e && prog && !(wprog = acp_to_wstr(prog, NULL))) e = E2BIG;
ret = child_result(CreateChild(wcmd, wprog, NULL, NULL, NULL, NULL, flags), mode);
if (!e) {
ret = child_result(CreateChild(wcmd, wprog, NULL, NULL, NULL, NULL, flags), mode);
}
free(wprog);
free(wcmd);
if (e) errno = e;
return ret;
}