svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/readline/readline.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/readline/readline.c
trunk/ext/readline/readline.c

laruence Sun, 11 Mar 2012 09:19:38 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=324104 Log: Fixed bug #61088 (Memory leak in readline_callback_handler_install). Bug: https://bugs.php.net/61088 (Assigned) Memory leak in readline_callback_handler_install Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/readline/readline.c U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/ext/readline/readline.c U php/php-src/trunk/ext/readline/readline.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2012-03-11 09:12:25 UTC (rev 324103) +++ php/php-src/branches/PHP_5_3/NEWS 2012-03-11 09:19:38 UTC (rev 324104) @@ -57,6 +57,10 @@ - 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 Modified: php/php-src/branches/PHP_5_3/ext/readline/readline.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/readline/readline.c 2012-03-11 09:12:25 UTC (rev 324103) +++ php/php-src/branches/PHP_5_3/ext/readline/readline.c 2012-03-11 09:19:38 UTC (rev 324104) @@ -561,9 +561,8 @@ 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); Modified: php/php-src/branches/PHP_5_4/NEWS =================================================================== --- php/php-src/branches/PHP_5_4/NEWS 2012-03-11 09:12:25 UTC (rev 324103) +++ php/php-src/branches/PHP_5_4/NEWS 2012-03-11 09:19:38 UTC (rev 324104) @@ -46,6 +46,10 @@ . Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled). (Johannes) +- Readline: + . Fixed bug #61088 (Memory leak in readline_callback_handler_install). + (Nikic, Laruence) + - Session . Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write()). (Ilia) Modified: php/php-src/branches/PHP_5_4/ext/readline/readline.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/readline/readline.c 2012-03-11 09:12:25 UTC (rev 324103) +++ php/php-src/branches/PHP_5_4/ext/readline/readline.c 2012-03-11 09:19:38 UTC (rev 324104) @@ -576,9 +576,8 @@ 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); Modified: php/php-src/trunk/ext/readline/readline.c =================================================================== --- php/php-src/trunk/ext/readline/readline.c 2012-03-11 09:12:25 UTC (rev 324103) +++ php/php-src/trunk/ext/readline/readline.c 2012-03-11 09:19:38 UTC (rev 324104) @@ -576,9 +576,8 @@ 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);