diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-05-31 22:53:35 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-06-09 10:52:38 -0700 |
| commit | 80367584910885baa1a2a4476a4a31efdcf0c9c0 (patch) | |
| tree | ecd64544b02fe2fd9b1fb144b4587e0f795b426e | |
| parent | f7d7befae8bcc2db0093f8adaa9f72eeb7ad891e (diff) | |
| download | php-git-80367584910885baa1a2a4476a4a31efdcf0c9c0.tar.gz | |
Fix bug #69646 OS command injection vulnerability in escapeshellarg
| -rw-r--r-- | ext/standard/exec.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/standard/exec.c b/ext/standard/exec.c index d6938a4809..d0b1e01e16 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -380,6 +380,14 @@ PHPAPI char *php_escape_shell_arg(char *str) } } #ifdef PHP_WIN32 + if (y > 0 && '\\' == cmd[y - 1]) { + int k = 0, n = y - 1; + for (; n >= 0 && '\\' == cmd[n]; n--, k++); + if (k % 2) { + cmd[y++] = '\\'; + } + } + cmd[y++] = '"'; #else cmd[y++] = '\''; |