clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

MF51: fix memory corruptions and leaks when cloning ArrayObjects and ArrayIterators

Browse Source
This commit is contained in:
Antony Dovgal 2006-04-07 22:53:34 +00:00
parent 589d830c32
commit 7cf30db27e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/spl/spl_array.c
View File

@ -149,10 +149,12 @@ static zend_object_value spl_array_object_new_ex(zend_class_entry *class_type, s
if (clone_orig) {
intern->array = other->array;
if (Z_OBJ_HT_P(orig) == &spl_handler_ArrayObject) {
ZVAL_ADDREF(intern->array);
SEPARATE_ZVAL(&intern->array);
MAKE_STD_ZVAL(intern->array);
array_init(intern->array);
zend_hash_copy(HASH_OF(intern->array), HASH_OF(other->array), (copy_ctor_func_t) zval_add_ref, &tmp, sizeof(zval*));
}
if (Z_OBJ_HT_P(orig) == &spl_handler_ArrayIterator) {
ZVAL_ADDREF(other->array);
ZVAL_ADDREF(intern->array);
}
} else {
intern->array = orig;