iliaa           Sun Nov 16 18:00:50 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/readline       readline.c 
  Log:
  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.3.2.8&r2=1.42.2.3.2.3.2.9&diff_format=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.42.2.3.2.3.2.8 
php-src/ext/readline/readline.c:1.42.2.3.2.3.2.9
--- php-src/ext/readline/readline.c:1.42.2.3.2.3.2.8    Sun Nov  2 21:19:35 2008
+++ php-src/ext/readline/readline.c     Sun Nov 16 18:00:50 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: readline.c,v 1.42.2.3.2.3.2.8 2008/11/02 21:19:35 felipe Exp $ */
+/* $Id: readline.c,v 1.42.2.3.2.3.2.9 2008/11/16 18:00:50 iliaa Exp $ */
 
 /* {{{ includes & prototypes */
 
@@ -187,7 +187,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
@@ -556,10 +556,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);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to