diff options
| author | Xinchen Hui <laruence@php.net> | 2012-03-11 09:19:38 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-03-11 09:19:38 +0000 |
| commit | 41fa157c441c374f5d8b312c962b502f59a1b31e (patch) | |
| tree | f1de652c72d0e7353ed23db916d887a40497c08c | |
| parent | e2efb6805668a9f22b16271e68b9a61bd8e4735c (diff) | |
| download | php-git-41fa157c441c374f5d8b312c962b502f59a1b31e.tar.gz | |
Fixed bug #61088 (Memory leak in readline_callback_handler_install).
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/readline/readline.c | 5 |
2 files changed, 6 insertions, 3 deletions
@@ -57,6 +57,10 @@ PHP NEWS - PHP-FPM SAPI: . Fixed bug #60811 (php-fpm compilation problem). (rasmus) +- Readline: + . Fixed bug #61088 (Memory leak in readline_callback_handler_install). + (Nikic, Laruence) + - SOAP . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry) . Fixed bug #60887 (SoapClient ignores user_agent option and sends no diff --git a/ext/readline/readline.c b/ext/readline/readline.c index b93d6cc0f4..c514cb8fd0 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -561,9 +561,8 @@ PHP_FUNCTION(readline_callback_handler_install) FREE_ZVAL(_prepped_callback); } - MAKE_STD_ZVAL(_prepped_callback); - *_prepped_callback = *callback; - zval_copy_ctor(_prepped_callback); + ALLOC_ZVAL(_prepped_callback); + MAKE_COPY_ZVAL(&callback, _prepped_callback); rl_callback_handler_install(prompt, php_rl_callback_handler); |