diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-05-31 22:53:35 -0700 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-06-10 10:59:13 +0200 |
| commit | e22f22e6ae83298454576f80b1a91373e7a21ce2 (patch) | |
| tree | de08a342659a45fe7f58a20d6cf4be086ac958a2 | |
| parent | 58e590aac6839ace470650c58bf418e5fa637eb3 (diff) | |
| download | php-git-e22f22e6ae83298454576f80b1a91373e7a21ce2.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 683878877b..06c068399d 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++] = '\''; |