diff options
| author | Nikita Popov <nikic@php.net> | 2016-10-20 13:26:34 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-10-20 13:26:34 +0200 |
| commit | 736633310cc5475ee9254321a8f0aeb0cbf797cc (patch) | |
| tree | 12a24c6ae180bc36d5a38db13e412d6cad32d4c0 | |
| parent | f5244f336ab096ea442dd9a4c6f5bfab625d58ab (diff) | |
| parent | 55d17662cb61bc29f443276b0cd50b3a62f91acc (diff) | |
| download | php-git-736633310cc5475ee9254321a8f0aeb0cbf797cc.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | ext/standard/array.c | 20 | ||||
| -rw-r--r-- | ext/standard/tests/array/array_replace_merge_recursive_ref.phpt | 31 |
2 files changed, 39 insertions, 12 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 8cf417bcfa..69439a7877 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2977,17 +2977,10 @@ PHPAPI int php_array_merge_recursive(HashTable *dest, HashTable *src) /* {{{ */ return 0; } - if (Z_ISREF_P(dest_entry)) { - if (Z_REFCOUNT_P(dest_entry) == 1) { - ZVAL_UNREF(dest_entry); - } else { - Z_DELREF_P(dest_entry); - ZVAL_DUP(dest_entry, dest_zval); - } - dest_zval = dest_entry; - } else { - SEPARATE_ZVAL(dest_zval); - } + ZEND_ASSERT(!Z_ISREF_P(dest_entry) || Z_REFCOUNT_P(dest_entry) > 1); + SEPARATE_ZVAL(dest_entry); + dest_zval = dest_entry; + if (Z_TYPE_P(dest_zval) == IS_NULL) { convert_to_array_ex(dest_zval); add_next_index_null(dest_zval); @@ -3110,7 +3103,10 @@ PHPAPI int php_array_replace_recursive(HashTable *dest, HashTable *src) /* {{{ * php_error_docref(NULL, E_WARNING, "recursion detected"); return 0; } - SEPARATE_ZVAL(dest_zval); + + ZEND_ASSERT(!Z_ISREF_P(dest_entry) || Z_REFCOUNT_P(dest_entry) > 1); + SEPARATE_ZVAL(dest_entry); + dest_zval = dest_entry; if (ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(dest_zval))) { Z_ARRVAL_P(dest_zval)->u.v.nApplyCount++; diff --git a/ext/standard/tests/array/array_replace_merge_recursive_ref.phpt b/ext/standard/tests/array/array_replace_merge_recursive_ref.phpt new file mode 100644 index 0000000000..e8d4f8e01e --- /dev/null +++ b/ext/standard/tests/array/array_replace_merge_recursive_ref.phpt @@ -0,0 +1,31 @@ +--TEST-- +Test array_(replace|merge)_recursive with references +--FILE-- +<?php + +$one = [1]; +$two = [42]; +$arr1 = ['k' => &$one]; +$arr2 = ['k' => &$two]; +var_dump(current($one), current($two)); +array_replace_recursive($arr1, $arr2); +var_dump(current($one), current($two)); + +$one = [1]; +$two = [42]; +$arr1 = ['k' => &$one]; +$arr2 = ['k' => &$two]; +var_dump(current($one), current($two)); +array_merge_recursive($arr1, $arr2); +var_dump(current($one), current($two)); + +?> +--EXPECT-- +int(1) +int(42) +int(1) +int(42) +int(1) +int(42) +int(1) +int(42) |