diff options
| author | Xinchen Hui <laruence@php.net> | 2012-06-16 14:30:21 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-06-16 14:30:21 +0800 |
| commit | df20808818f052da92c3cb57b5d52149f213dd68 (patch) | |
| tree | c36c7807859af864e8257d59cb88d2adba494ef6 /sapi | |
| parent | bf8b58429b7eafbf76d63e82e55f9b6f29e0b3a6 (diff) | |
| parent | 11a202ef50fdcd92b5cc3b3e1d5a739cd85b7541 (diff) | |
| download | php-git-df20808818f052da92c3cb57b5d52149f213dd68.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix potential leak in cli server
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 87ab7b48f4..876c57a34d 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1826,6 +1826,9 @@ static int php_cli_server_send_error_page(php_cli_server *server, php_cli_server return SUCCESS; fail: + if (errstr) { + pefree(errstr, 1); + } efree(escaped_request_uri); return FAILURE; } /* }}} */ |