cvs: php-src(PHP_5_2) / NEWS /ext/readline readline.c

iliaa Sun Nov 16 18:01:25 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/readline readline.c /php-src NEWS Log: MFB: Fixed memory leak inside readline_callback_handler_install() function http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.42.2.3.2.5&r2=1.42.2.3.2.6&diff_format=u Index: php-src/ext/readline/readline.c diff -u php-src/ext/readline/readline.c:1.42.2.3.2.5 php-src/ext/readline/readline.c:1.42.2.3.2.6 --- php-src/ext/readline/readline.c:1.42.2.3.2.5 Wed Sep 10 13:48:14 2008 +++ php-src/ext/readline/readline.c Sun Nov 16 18:01:24 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: readline.c,v 1.42.2.3.2.5 2008/09/10 13:48:14 felipe Exp $ */ +/* $Id: readline.c,v 1.42.2.3.2.6 2008/11/16 18:01:24 iliaa Exp $ */ /* {{{ includes & prototypes */ @@ -120,7 +120,7 @@ #if HAVE_RL_CALLBACK_READ_CHAR if (_prepped_callback) { rl_callback_handler_remove(); - FREE_ZVAL(_prepped_callback); + zval_ptr_dtor(&_prepped_callback); _prepped_callback = 0; } #endif @@ -507,10 +507,11 @@ efree(name); RETURN_FALSE; } + efree(name); if (_prepped_callback) { rl_callback_handler_remove(); - FREE_ZVAL(_prepped_callback); + zval_ptr_dtor(&_prepped_callback); } MAKE_STD_ZVAL(_prepped_callback); http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1315&r2=1.2027.2.547.2.1316&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1315 php-src/NEWS:1.2027.2.547.2.1316 --- php-src/NEWS:1.2027.2.547.2.1315 Thu Nov 13 19:23:51 2008 +++ php-src/NEWS Sun Nov 16 18:01:25 2008 @@ -6,6 +6,8 @@ - Fixed sybase_fetch_*() to continue reading after CS_ROW_FAIL status (Timm) - Fixed a bug inside dba_replace() that could cause file truncation with invalid keys. (Ilia) +- Fixed memory leak inside readline_callback_handler_install() function. + (Ilia) - Fixed bug #46543 (ibase_trans() memory leaks when using wrong parameters). (Felipe)