diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-08-05 20:15:53 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-08-05 20:15:53 +0000 |
| commit | 02e0e08958d6398ac77cddc256f0ccfd5297b763 (patch) | |
| tree | 79dd50ac489b79b96489735c9c3b5042941e7bff /ext/standard/exec.c | |
| parent | 5ead9d369e7b2c6cbfa61d8dd227c12faa738bf1 (diff) | |
| download | php-git-02e0e08958d6398ac77cddc256f0ccfd5297b763.tar.gz | |
Fixed bug #18291 (escapeshellcmd() can now handle quoted arguments).
Diffstat (limited to 'ext/standard/exec.c')
| -rw-r--r-- | ext/standard/exec.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 768b0d364c..14f02d65f3 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -260,18 +260,28 @@ PHP_FUNCTION(passthru) char *php_escape_shell_cmd(char *str) { register int x, y, l; char *cmd; + char *p = NULL; l = strlen(str); cmd = emalloc(2 * l + 1); for (x = 0, y = 0; x < l; x++) { switch (str[x]) { + case '"': + case '\'': + if (!p && (p = memchr(str + x + 1, str[x], l - x - 1))) { + /* noop */ + } else if (p && *p == str[x]) { + p = NULL; + } else { + cmd[y++] = '\\'; + } + cmd[y++] = str[x]; + break; case '#': /* This is character-set independent */ case '&': case ';': case '`': - case '\'': - case '"': case '|': case '*': case '?': |