summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-06-16 06:30:21 (GMT)
committerXinchen Hui <laruence@php.net>2012-06-16 06:30:21 (GMT)
commitdf20808818f052da92c3cb57b5d52149f213dd68 (patch)
treec36c7807859af864e8257d59cb88d2adba494ef6
parentbf8b58429b7eafbf76d63e82e55f9b6f29e0b3a6 (diff)
parent11a202ef50fdcd92b5cc3b3e1d5a739cd85b7541 (diff)
downloadphp-master.tar.gz
Merge branch 'PHP-5.4'HEADmaster
* PHP-5.4: Fix potential leak in cli server
-rw-r--r--sapi/cli/php_cli_server.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 87ab7b4..876c57a 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;
} /* }}} */