[PHP-CVS] cvs: php-src(PHP_5_2) /ext/readline readline.c

2008-11-21 Thread Felipe Pena 
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.7r2=1.42.2.3.2.8diff_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.7Thu 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;



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/readline readline.c /ext/readline/tests readline_completion_function_001.phpt

2008-11-20 Thread Felipe Pena 
felipe  Thu Nov 20 22:26:32 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/readline/tests readline_completion_function_001.phpt 

  Modified files:  
/php-src/ext/readline   readline.c 
  Log:
  - MFH: Fixed memory leaks in readline_completion_function()
  
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.42.2.3.2.6r2=1.42.2.3.2.7diff_format=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.42.2.3.2.6 
php-src/ext/readline/readline.c:1.42.2.3.2.7
--- php-src/ext/readline/readline.c:1.42.2.3.2.6Sun Nov 16 18:01:24 2008
+++ php-src/ext/readline/readline.c Thu Nov 20 22:26:32 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: readline.c,v 1.42.2.3.2.6 2008/11/16 18:01:24 iliaa Exp $ */
+/* $Id: readline.c,v 1.42.2.3.2.7 2008/11/20 22:26:32 felipe Exp $ */
 
 /* {{{ includes  prototypes */
 
@@ -115,8 +115,10 @@
 
 PHP_RSHUTDOWN_FUNCTION(readline)
 {
-   if (_readline_completion) 
+   if (_readline_completion) {
+   zval_dtor(_readline_completion);
FREE_ZVAL(_readline_completion);
+   }
 #if HAVE_RL_CALLBACK_READ_CHAR
if (_prepped_callback) {
rl_callback_handler_remove();
@@ -456,9 +458,12 @@
efree(name);
RETURN_FALSE;
}
+   efree(name);
 
-   if (_readline_completion)
+   if (_readline_completion) {
+   zval_dtor(_readline_completion);
FREE_ZVAL(_readline_completion);
+   }
 
MAKE_STD_ZVAL(_readline_completion);
*_readline_completion = *arg;

http://cvs.php.net/viewvc.cgi/php-src/ext/readline/tests/readline_completion_function_001.phpt?view=markuprev=1.1
Index: php-src/ext/readline/tests/readline_completion_function_001.phpt
+++ php-src/ext/readline/tests/readline_completion_function_001.phpt
--TEST--
readline_completion_function(): Basic test
--SKIPIF--
?php if (!extension_loaded(readline)) die(skip); ?
--FILE--
?php

function foo() { }

$data = array(
'foo',
'strtolower',
1,
1.1231
);

foreach ($data as $callback) {
readline_completion_function($callback);
}

?
--EXPECTF--
Warning: readline_completion_function(): 1 is not callable in %s on line %d

Warning: readline_completion_function(): 1.1231 is not callable in %s on line %d



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/readline readline.c

2008-09-10 Thread Felipe Pena 
felipe  Wed Sep 10 13:48:14 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/readline   readline.c 
  Log:
  - MFB: Fixed mem. leak
  
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.42.2.3.2.4r2=1.42.2.3.2.5diff_format=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.42.2.3.2.4 
php-src/ext/readline/readline.c:1.42.2.3.2.5
--- php-src/ext/readline/readline.c:1.42.2.3.2.4Mon Dec 31 07:20:10 2007
+++ php-src/ext/readline/readline.c Wed Sep 10 13:48:14 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: readline.c,v 1.42.2.3.2.4 2007/12/31 07:20:10 sebastian Exp $ */
+/* $Id: readline.c,v 1.42.2.3.2.5 2008/09/10 13:48:14 felipe Exp $ */
 
 /* {{{ includes  prototypes */
 
@@ -504,6 +504,7 @@
 
if (!zend_is_callable(callback, 0, name)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s is not 
callable, name);
+   efree(name);
RETURN_FALSE;
}
 



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/readline readline.c

2007-02-11 Thread Ilia Alshanetsky 
iliaa   Mon Feb 12 01:23:17 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/readline   readline.c 
  Log:
  
  Fixed a memory leak inside readline_completion_function() on non-callable
  callback.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.42.2.3.2.2r2=1.42.2.3.2.3diff_format=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.42.2.3.2.2 
php-src/ext/readline/readline.c:1.42.2.3.2.3
--- php-src/ext/readline/readline.c:1.42.2.3.2.2Mon Jan  1 09:36:05 2007
+++ php-src/ext/readline/readline.c Mon Feb 12 01:23:17 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: readline.c,v 1.42.2.3.2.2 2007/01/01 09:36:05 sebastian Exp $ */
+/* $Id: readline.c,v 1.42.2.3.2.3 2007/02/12 01:23:17 iliaa Exp $ */
 
 /* {{{ includes  prototypes */
 
@@ -453,6 +453,7 @@
 
if (!zend_is_callable(arg, 0, name)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s is not 
callable, name);
+   efree(name);
RETURN_FALSE;
}
 

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/readline readline.c

2006-09-04 Thread Nuno Lopes 
nlopess Mon Sep  4 18:59:01 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/readline   readline.c 
  Log:
  fix gcc warning
  
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.42.2.3r2=1.42.2.3.2.1diff_format=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.42.2.3 
php-src/ext/readline/readline.c:1.42.2.3.2.1
--- php-src/ext/readline/readline.c:1.42.2.3Sun Jan  1 12:50:12 2006
+++ php-src/ext/readline/readline.c Mon Sep  4 18:59:01 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: readline.c,v 1.42.2.3 2006/01/01 12:50:12 sniper Exp $ */
+/* $Id: readline.c,v 1.42.2.3.2.1 2006/09/04 18:59:01 nlopess Exp $ */
 
 /* {{{ includes  prototypes */
 
@@ -363,7 +363,7 @@
 /* {{{ proto bool readline_completion_function(string funcname) 
Readline completion function? */
 
-static char *_readline_command_generator(char *text,int state)
+static char *_readline_command_generator(const char *text, int state)
 {
HashTable  *myht = Z_ARRVAL(_readline_array);
zval **entry;

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