cvs: php-src /ext/spl spl_array.c /ext/spl/tests bug36941.phpt

helly Sun Apr 2 15:04:04 2006 UTC Modified files: /php-src/ext/spl spl_array.c /php-src/ext/spl/tests bug36941.phpt Log: - Behavior fix for #36941 http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.c?r1=1.106&r2=1.107&diff_format=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.106 php-src/ext/spl/spl_array.c:1.107 --- php-src/ext/spl/spl_array.c:1.106 Sat Apr 1 22:39:42 2006 +++ php-src/ext/spl/spl_array.c Sun Apr 2 15:04:04 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.106 2006/04/01 22:39:42 helly Exp $ */ +/* $Id: spl_array.c,v 1.107 2006/04/02 15:04:04 helly Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -121,7 +121,7 @@ zend_object_iterator *spl_array_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC); /* {{{ spl_array_object_new */ -static zend_object_value spl_array_object_new_ex(zend_class_entry *class_type, spl_array_object **obj, zval *orig TSRMLS_DC) +static zend_object_value spl_array_object_new_ex(zend_class_entry *class_type, spl_array_object **obj, zval *orig, int clone_orig TSRMLS_DC) { zend_object_value retval; spl_array_object *intern; @@ -138,13 +138,26 @@ zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); intern->ar_flags = 0; + intern->ce_get_iterator = spl_ce_ArrayIterator; if (orig) { spl_array_object *other = (spl_array_object*)zend_object_store_get_object(orig TSRMLS_CC); - intern->array = orig; - ZVAL_ADDREF(intern->array); intern->ar_flags &= ~ SPL_ARRAY_CLONE_MASK; - intern->ar_flags |= (other->ar_flags & SPL_ARRAY_CLONE_MASK) | SPL_ARRAY_IS_REF | SPL_ARRAY_USE_OTHER; + intern->ar_flags |= (other->ar_flags & SPL_ARRAY_CLONE_MASK); + intern->ce_get_iterator = other->ce_get_iterator; + if (clone_orig) { + intern->array = other->array; + if (Z_OBJ_HT_P(orig) == &spl_handler_ArrayObject) { + ZVAL_ADDREF(intern->array); + SEPARATE_ZVAL(&intern->array); + ZVAL_ADDREF(other->array); + ZVAL_ADDREF(intern->array); + } + } else { + intern->array = orig; + ZVAL_ADDREF(intern->array); + intern->ar_flags |= SPL_ARRAY_IS_REF | SPL_ARRAY_USE_OTHER; + } } else { MAKE_STD_ZVAL(intern->array); array_init(intern->array); @@ -204,7 +217,6 @@ } } - intern->ce_get_iterator = spl_ce_ArrayIterator; zend_hash_internal_pointer_reset_ex(spl_array_get_hash_table(intern, 0 TSRMLS_CC), &intern->pos); return retval; } @@ -214,7 +226,7 @@ static zend_object_value spl_array_object_new(zend_class_entry *class_type TSRMLS_DC) { spl_array_object *tmp; - return spl_array_object_new_ex(class_type, &tmp, NULL TSRMLS_CC); + return spl_array_object_new_ex(class_type, &tmp, NULL, 0 TSRMLS_CC); } /* }}} */ @@ -228,8 +240,7 @@ spl_array_object *intern; old_object = zend_objects_get_address(zobject TSRMLS_CC); - SEPARATE_ZVAL(&zobject); - new_obj_val = spl_array_object_new_ex(old_object->ce, &intern, zobject TSRMLS_CC); + new_obj_val = spl_array_object_new_ex(old_object->ce, &intern, zobject, 1 TSRMLS_CC); new_object = &intern->std; zend_objects_clone_members(new_object, new_obj_val, old_object, handle TSRMLS_CC); @@ -895,6 +906,7 @@ } if (object == array) { intern->ar_flags |= SPL_ARRAY_IS_SELF; + intern->ar_flags &= ~SPL_ARRAY_USE_OTHER; } else { intern->ar_flags &= ~SPL_ARRAY_IS_SELF; } @@ -1033,7 +1045,7 @@ } return_value->type = IS_OBJECT; - return_value->value.obj = spl_array_object_new_ex(intern->ce_get_iterator, &iterator, object TSRMLS_CC); + return_value->value.obj = spl_array_object_new_ex(intern->ce_get_iterator, &iterator, object, 0 TSRMLS_CC); return_value->refcount = 1; return_value->is_ref = 1; } http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/tests/bug36941.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/spl/tests/bug36941.phpt diff -u php-src/ext/spl/tests/bug36941.phpt:1.1 php-src/ext/spl/tests/bug36941.phpt:1.2 --- php-src/ext/spl/tests/bug36941.phpt:1.1 Sat Apr 1 22:39:42 2006 +++ php-src/ext/spl/tests/bug36941.phpt Sun Apr 2 15:04:04 2006 @@ -1,6 +1,20 @@ --TEST-- Bug #36941 (ArrayIterator does not clone itself) --FILE-- +===ArrayObject=== +<?php +$a = new ArrayObject(); +$a[] = 1; + +$b = clone $a; + +var_dump($a[0], $b[0]); +$b[0] = $b[0] + 1; +var_dump($a[0], $b[0]); +$b[0] = 3; +var_dump($a[0], $b[0]); +?> +===ArrayIterator=== <?php $a = new ArrayIterator(); $a[] = 1; @@ -15,10 +29,18 @@ ?> ===DONE=== --EXPECT-- +===ArrayObject=== int(1) int(1) int(1) int(2) int(1) int(3) +===ArrayIterator=== +int(1) +int(1) +int(2) +int(2) +int(3) +int(3) ===DONE===