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

Fix bug #42850 array_walk_recursive() leaves references, refix bug #34982

Browse Source
This commit is contained in:
Brian Shire 2008-01-14 22:08:00 +00:00
parent c54b89e06b
commit e643a40051
2 changed files with 94 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/array.c
View File

@ -1061,7 +1061,7 @@ static int php_array_walk(HashTable *target_hash, zval **userdata, int recursive
zend_fcall_info orig_array_walk_fci;
zend_fcall_info_cache orig_array_walk_fci_cache;
SEPARATE_ZVAL_TO_MAKE_IS_REF(args[0]);
SEPARATE_ZVAL_IF_NOT_REF(args[0]);
thash = HASH_OF(*(args[0]));
if (thash->nApplyCount > 1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "recursion detected");

93
ext/standard/tests/array/bug42850.phpt Normal file
View File

@ -0,0 +1,93 @@
--TEST--
Bug #42850 array_walk_recursive() leaves references, #34982 array_walk_recursive() modifies elements outside function scope
--FILE--
<?php
// Bug #42850
$data = array ('key1' => 'val1', array('key2' => 'val2'));
function apply_dumb($item, $key) {};
var_dump($data);
array_walk_recursive($data, 'apply_dumb');
$data2 = $data;
$data2[0] = 'altered';
var_dump($data);
var_dump($data2);
// Bug #34982
function myfunc($data) {
array_walk_recursive($data, 'apply_changed');
}
function apply_changed(&$input, $key) {
$input = 'changed';
}
myfunc($data);
var_dump($data);
--EXPECT--
array(2) {
["key1"]=>
string(4) "val1"
[0]=>
array(1) {
["key2"]=>
string(4) "val2"
}
}
array(2) {
["key1"]=>
string(4) "val1"
[0]=>
array(1) {
["key2"]=>
string(4) "val2"
}
}
array(2) {
["key1"]=>
string(4) "val1"
[0]=>
string(7) "altered"
}
array(2) {
["key1"]=>
string(4) "val1"
[0]=>
array(1) {
["key2"]=>
string(4) "val2"
}
}
--UEXPECT--
array(2) {
[u"key1"]=>
unicode(4) "val1"
[0]=>
array(1) {
[u"key2"]=>
unicode(4) "val2"
}
}
array(2) {
[u"key1"]=>
unicode(4) "val1"
[0]=>
array(1) {
[u"key2"]=>
unicode(4) "val2"
}
}
array(2) {
[u"key1"]=>
unicode(4) "val1"
[0]=>
unicode(7) "altered"
}
array(2) {
[u"key1"]=>
unicode(4) "val1"
[0]=>
array(1) {
[u"key2"]=>
unicode(4) "val2"
}
}