php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 17:52:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

- MFH: Fixed memory leaks in readline_completion_function()

Browse Source
This commit is contained in:
Felipe Pena
2008-11-20 22:26:32 +00:00
parent 2b251dc603
commit 22851007ca
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ext/readline/readline.c
View File

@@ -115,8 +115,10 @@ PHP_MINIT_FUNCTION(readline)
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 @@ PHP_FUNCTION(readline_completion_function)
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;

25
ext/readline/tests/readline_completion_function_001.phpt Normal file
View File

@@ -0,0 +1,25 @@
--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