clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Promote warnings to errors in array_merge(_recursive)() and array_replace()

Browse Source
This commit is contained in:
George Peter Banyard 2019-08-21 02:36:20 +02:00 committed by Joe Watkins
parent 3da3b4c8f8
commit 20edea5a85
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
5 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/standard/array.c
View File

@ -3577,7 +3577,7 @@ PHPAPI int php_array_merge_recursive(HashTable *dest, HashTable *src) /* {{{ */
ZVAL_DEREF(dest_zval);
thash = Z_TYPE_P(dest_zval) == IS_ARRAY ? Z_ARRVAL_P(dest_zval) : NULL;
if ((thash && GC_IS_RECURSIVE(thash)) || (src_entry == dest_entry && Z_ISREF_P(dest_entry) && (Z_REFCOUNT_P(dest_entry) % 2))) {
php_error_docref(NULL, E_WARNING, "recursion detected");
zend_throw_error(NULL, "Recursion detected");
return 0;
}
@ -3698,7 +3698,7 @@ PHPAPI int php_array_replace_recursive(HashTable *dest, HashTable *src) /* {{{ *
if (Z_IS_RECURSIVE_P(dest_zval) ||
Z_IS_RECURSIVE_P(src_zval) ||
(Z_ISREF_P(src_entry) && Z_ISREF_P(dest_entry) && Z_REF_P(src_entry) == Z_REF_P(dest_entry) && (Z_REFCOUNT_P(dest_entry) % 2))) {
php_error_docref(NULL, E_WARNING, "recursion detected");
zend_throw_error(NULL, "Recursion detected");
return 0;
}

24
ext/standard/tests/array/array_replace.phpt
View File

@ -42,11 +42,15 @@ $data = array_replace_recursive($array1, $array2);
var_dump($data);
echo " -- Testing array_replace_recursive() w/ endless recusrsion --\n";
$data = array_replace_recursive($array3, $array4);
try {
$data = array_replace_recursive($array3, $array4);
var_dump($data);
} catch (\Error $e) {
echo $e->getMessage() . "\n";
}
var_dump($data);
?>
--EXPECTF--
--EXPECT--
-- Testing array_replace() --
array(5) {
[0]=>
@ -107,16 +111,4 @@ array(5) {
}
}
-- Testing array_replace_recursive() w/ endless recusrsion --
Warning: array_replace_recursive(): recursion detected in %s on line %d
array(1) {
[0]=>
array(1) {
[0]=>
array(1) {
[0]=>
array(0) {
}
}
}
}
Recursion detected

10
ext/standard/tests/array/bug42177.phpt
View File

@ -18,7 +18,11 @@ unset( $a1, $a2 );
$a1 = array();
$a2 = array( 'key1' => &$a1 );
$a1 = array_merge_recursive( $a1, $a2 );
$a1 = array_merge_recursive( $a1, $a2 );
try {
$a1 = array_merge_recursive( $a1, $a2 );
} catch (\Error $e) {
echo $e->getMessage() . " on line " . $e->getLine() . "\n";
}
unset( $a1, $a2 );
$x = 'foo';
@ -30,5 +34,5 @@ $a1 = array_merge_recursive( $a1, $a2 );
unset( $a1, $a2 );
?>
--EXPECTF--
Warning: array_merge_recursive(): recursion detected in %s on line 18
--EXPECT--
Recursion detected on line 19

17
ext/standard/tests/array/bug43495.phpt
View File

@ -8,14 +8,21 @@ $a["key1"]["key2"]["key3"]=&$a;
$b=array("key1"=>array("key2"=>array()));
$b["key1"]["key2"]["key3"]=&$b;
array_merge_recursive($a,$b);
try {
array_merge_recursive($a,$b);
} catch (\Error $e) {
echo $e->getMessage() . "\n";
}
/* Break recursion */
$a["key1"]["key2"]["key3"] = null;
$b["key1"]["key2"]["key3"] = null;
echo "Done.\n";
?>
--EXPECTF--
Warning: array_merge_recursive(): recursion detected in %sbug43495.php on line %d
Done.
DONE
--EXPECT--
Recursion detected
DONE

10
ext/standard/tests/array/bug65251.phpt
View File

@ -3,8 +3,12 @@ Bug #65251: array_merge_recursive() recursion detection broken
--FILE--
<?php
array_merge_recursive($GLOBALS, $GLOBALS)
try {
array_merge_recursive($GLOBALS, $GLOBALS);
} catch (\Error $e) {
echo $e->getMessage() . "\n";
}
?>
--EXPECTF--
Warning: array_merge_recursive(): recursion detected in %s on line %d
--EXPECT--
Recursion detected