dmitry Mon Sep 12 05:59:48 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard array.c
Log:
Additinal fix for bug #34277 (array_filter() crashes with references and
objects)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.199.2.44.2.7&r2=1.199.2.44.2.8&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.199.2.44.2.7
php-src/ext/standard/array.c:1.199.2.44.2.8
--- php-src/ext/standard/array.c:1.199.2.44.2.7 Thu Sep 1 08:01:27 2005
+++ php-src/ext/standard/array.c Mon Sep 12 05:59:47 2005
@@ -22,7 +22,7 @@
*/
-/* $Id: array.c,v 1.199.2.44.2.7 2005/09/01 12:01:27 dmitry Exp $ */
+/* $Id: array.c,v 1.199.2.44.2.8 2005/09/12 09:59:47 dmitry Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -3317,7 +3317,7 @@
PHP_FUNCTION(array_filter)
{
zval **input, **callback = NULL;
- zval *array;
+ zval *array, *func = NULL;
zval **operand;
zval **args[1];
zval *retval = NULL;
@@ -3336,10 +3336,13 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "The first argument
should be an array");
return;
}
+ if (callback) {
+ func = *callback;
+ }
array = *input;
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, '%s', should be a valid callback", callback_name);
efree(callback_name);
return;
@@ -3355,9 +3358,9 @@
zend_hash_get_current_data_ex(Z_ARRVAL_P(array), (void
**)&operand, &pos) == SUCCESS;
zend_hash_move_forward_ex(Z_ARRVAL_P(array), &pos)) {
- if (callback) {
+ if (func) {
args[0] = operand;
- if (call_user_function_ex(EG(function_table), NULL,
*callback, &retval, 1, args, 0, NULL TSRMLS_CC) == SUCCESS && retval) {
+ if (call_user_function_ex(EG(function_table), NULL,
func, &retval, 1, args, 0, NULL TSRMLS_CC) == SUCCESS && retval) {
if (!zend_is_true(retval)) {
zval_ptr_dtor(&retval);
continue;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
