]> granicus.if.org Git - php/commitdiff
- Fixed bug in handling arrays which caused the original array being modified too.
authorJani Taskinen <jani@php.net>
Wed, 6 Feb 2008 19:05:18 +0000 (19:05 +0000)
committerJani Taskinen <jani@php.net>
Wed, 6 Feb 2008 19:05:18 +0000 (19:05 +0000)
ext/filter/filter.c

index 3fe722bd7576efb081953bfb74dff266829aa3e5..1ef6656568312d88bae9474ebb4bbe1a82dc8ed7 100644 (file)
@@ -457,8 +457,9 @@ static void php_zval_filter_recursive(zval **value, long filter, long flags, zva
 
                for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(value), &pos);
                         zend_hash_get_current_data_ex(Z_ARRVAL_PP(value), (void **) &element, &pos) == SUCCESS;
-                        zend_hash_move_forward_ex(Z_ARRVAL_PP(value), &pos)) {
-
+                        zend_hash_move_forward_ex(Z_ARRVAL_PP(value), &pos)
+               ) {
+                       SEPARATE_ZVAL_IF_NOT_REF(element);
                                if (Z_TYPE_PP(element) == IS_ARRAY) {
                                        Z_ARRVAL_PP(element)->nApplyCount++;
                                        php_zval_filter_recursive(element, filter, flags, options, charset, copy TSRMLS_CC);