diff options
author | Thomas Punt <tpunt@php.net> | 2018-04-26 16:42:21 +0100 |
---|---|---|
committer | Thomas Punt <tpunt@php.net> | 2018-04-26 16:42:21 +0100 |
commit | b3fff5fc412fa8f2e2243e7e625e7e3daf9639fb (patch) | |
tree | b544387831995b90bd0f608c98a54527644f2ac5 | |
parent | 7c852a7961051b8e7b2c425fee23864a8db8010e (diff) | |
parent | 435e812c09b4f1751079356957e24a1a096f93f6 (diff) | |
download | php-git-b3fff5fc412fa8f2e2243e7e625e7e3daf9639fb.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix memory leak when phpdbg fails to start up
-rw-r--r-- | sapi/phpdbg/phpdbg.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index c444a72d5f..ec4c4f2df5 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1805,6 +1805,11 @@ phpdbg_main: if (php_request_startup() == FAILURE) { PUTS("Could not startup"); +#ifndef _WIN32 + if (address) { + free(address); + } +#endif return 1; } |