cvs: php-src(PHP_5_2) /ext/readline readline.c
| From: | Felipe Pena | Date: | Fri, 21 Nov 2008 22:48:27 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/readline readline.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-54387@lists.php.net to get a copy of this message | ||
felipe Fri Nov 21 22:48:27 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/readline readline.c
Log:
- MFH: Fixed memory leak in readline_callback_handler_remove()
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.42.2.3.2.7&r2=1.42.2.3.2.8&diff_format=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.42.2.3.2.7 php-src/ext/readline/readline.c:1.42.2.3.2.8
--- php-src/ext/readline/readline.c:1.42.2.3.2.7 Thu Nov 20 22:26:32 2008
+++ php-src/ext/readline/readline.c Fri Nov 21 22:48:27 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: readline.c,v 1.42.2.3.2.7 2008/11/20 22:26:32 felipe Exp $ */
+/* $Id: readline.c,v 1.42.2.3.2.8 2008/11/21 22:48:27 felipe Exp $ */
/* {{{ includes & prototypes */
@@ -516,7 +516,8 @@
if (_prepped_callback) {
rl_callback_handler_remove();
- zval_ptr_dtor(&_prepped_callback);
+ zval_dtor(_prepped_callback);
+ FREE_ZVAL(_prepped_callback);
}
MAKE_STD_ZVAL(_prepped_callback);
@@ -545,6 +546,7 @@
{
if (_prepped_callback) {
rl_callback_handler_remove();
+ zval_dtor(_prepped_callback);
FREE_ZVAL(_prepped_callback);
_prepped_callback = 0;
RETURN_TRUE;