archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Additinal fix for bug #34277 (array_filter() crashes with references and objects)

Browse source
This commit is contained in:
Dmitry Stogov 2005-09-12 09:58:35 +00:00
parent 161777af26
commit 03c6efab67
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/standard/array.c
View file

@ -4364,7 +4364,7 @@ PHP_FUNCTION(array_reduce)
PHP_FUNCTION(array_filter) PHP_FUNCTION(array_filter)
{ {
zval **input, **callback = NULL; zval **input, **callback = NULL;
zval *array; zval *array, *func = NULL;
zval **operand; zval **operand;
zval **args[1]; zval **args[1];
zval *retval = NULL; zval *retval = NULL;
@ -4384,10 +4384,13 @@ PHP_FUNCTION(array_filter)
php_error_docref(NULL TSRMLS_CC, E_WARNING, "The first argument should be an array"); php_error_docref(NULL TSRMLS_CC, E_WARNING, "The first argument should be an array");
return; return;
} }
if (callback) {
func = *callback;
}
array = *input; array = *input;
if (ZEND_NUM_ARGS() > 1) { if (ZEND_NUM_ARGS() > 1) {
if (!zend_is_callable(*callback, 0, &callback_name)) { if (!zend_is_callable(func, 0, &callback_name)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "The second argument, '%R', should be a valid callback", Z_TYPE(callback_name), Z_UNIVAL(callback_name)); php_error_docref(NULL TSRMLS_CC, E_WARNING, "The second argument, '%R', should be a valid callback", Z_TYPE(callback_name), Z_UNIVAL(callback_name));
zval_dtor(&callback_name); zval_dtor(&callback_name);
return; return;
@ -4405,14 +4408,14 @@ PHP_FUNCTION(array_filter)
zend_hash_move_forward_ex(Z_ARRVAL_P(array), &pos)) { zend_hash_move_forward_ex(Z_ARRVAL_P(array), &pos)) {
zend_uchar utype; zend_uchar utype;
if (callback) { if (func) {
zend_fcall_info fci; zend_fcall_info fci;
args[0] = operand; args[0] = operand;
fci.size = sizeof(fci); fci.size = sizeof(fci);
fci.function_table = EG(function_table); fci.function_table = EG(function_table);
fci.function_name = *callback; fci.function_name = func;
fci.symbol_table = NULL; fci.symbol_table = NULL;
fci.object_pp = NULL; fci.object_pp = NULL;
fci.retval_ptr_ptr = &retval; fci.retval_ptr_ptr = &retval;