diff --git a/ChangeLog b/ChangeLog index 6451349a4f..599c992b98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 3 11:14:14 2014 NAKAMURA Usaku + + * win32/win32.c (w32_spawn): `v2` is used not only for `shell` but also + `cmd`, so must not free before using `cmd`. + [ruby-core:66648] [Bug #10563] + Wed Dec 3 09:48:57 2014 Nobuyoshi Nakada * ext/racc/cparse/cparse.c (cparse_params_type): use typed data. diff --git a/win32/win32.c b/win32/win32.c index 949e918bd0..dc0232b237 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1321,9 +1321,9 @@ w32_spawn(int mode, const char *cmd, const char *prog, UINT cp) } if (!e && shell && !(wshell = mbstr_to_wstr(cp, shell, -1, NULL))) e = E2BIG; - if (v2) ALLOCV_END(v2); if (cmd_sep) *cmd_sep = sep; if (!e && cmd && !(wcmd = mbstr_to_wstr(cp, cmd, -1, NULL))) e = E2BIG; + if (v2) ALLOCV_END(v2); if (v) ALLOCV_END(v); if (!e) {