diff options
| author | Felipe Pena <felipe@php.net> | 2008-03-12 19:18:42 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-03-12 19:18:42 +0000 |
| commit | eea093b47c52297d50764c8a952ca9ed899d6bd7 (patch) | |
| tree | 82ef428592a767a6c81d412900a512e3871fc2ee | |
| parent | c94d9b0c126d09e4d0fe563442a6783cd0f671e2 (diff) | |
| download | php-git-eea093b47c52297d50764c8a952ca9ed899d6bd7.tar.gz | |
MFB: Fixed bug #42177 (Warning "array_merge_recursive(): recursion detected" comes again...)
| -rw-r--r-- | ext/standard/array.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/array/bug42177.phpt | 34 |
2 files changed, 35 insertions, 1 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 9d926ecd1e..6b4db94d8b 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2210,7 +2210,7 @@ PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS if (recursive && zend_hash_find(dest, string_key, string_key_len, (void **)&dest_entry) == SUCCESS) { HashTable *thash = HASH_OF(*dest_entry); - if ((thash && thash->nApplyCount > 1) || (*src_entry == *dest_entry && (Z_REFCOUNT_PP(dest_entry) % 2))) { + if ((thash && thash->nApplyCount > 1) || (*src_entry == *dest_entry && Z_ISREF_PP(dest_entry) && (Z_REFCOUNT_PP(dest_entry) % 2))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "recursion detected"); return 0; } diff --git a/ext/standard/tests/array/bug42177.phpt b/ext/standard/tests/array/bug42177.phpt new file mode 100644 index 0000000000..5678ca3cac --- /dev/null +++ b/ext/standard/tests/array/bug42177.phpt @@ -0,0 +1,34 @@ +--TEST-- +Bug #42177 (Warning "array_merge_recursive(): recursion detected" comes again...) +--FILE-- +<?php + +$a1 = array( 'key1' => 1, 'key3' => 2 ); +$a2 = array(); +$a1 = array_merge_recursive( $a1, $a2 ); +$a1 = array_merge_recursive( $a1, $a2 ); +unset( $a1, $a2 ); + +$a1 = array(); +$a2 = array( 'key1' => 1, 'key3' => 2 ); +$a1 = array_merge_recursive( $a1, $a2 ); +$a1 = array_merge_recursive( $a1, $a2 ); +unset( $a1, $a2 ); + +$a1 = array(); +$a2 = array( 'key1' => &$a1 ); +$a1 = array_merge_recursive( $a1, $a2 ); +$a1 = array_merge_recursive( $a1, $a2 ); +unset( $a1, $a2 ); + +$x = 'foo'; +$y =& $x; +$a1 = array($x, $y, $x, $y); +$a2 = array( 'key1' => $a1, $x, $y ); +$a1 = array_merge_recursive( $a1, $a2 ); +$a1 = array_merge_recursive( $a1, $a2 ); +unset( $a1, $a2 ); + +?> +--EXPECTF-- +Warning: array_merge_recursive(): recursion detected in %s on line 18 |