mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-13 06:24:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed clobbering of the source array, when merging complex

Browse Source 
multi-dimensional arrays. Bug reported by Lukas Smith.
This commit is contained in:
Ilia Alshanetsky 2003-10-05 19:37:02 +00:00
parent f46b5641b7
commit 31a3c87159
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/array.c
View File

@ -2168,6 +2168,8 @@ PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS
return 0;
}
SEPARATE_ZVAL(dest_entry);
SEPARATE_ZVAL(src_entry);
convert_to_array_ex(dest_entry);
convert_to_array_ex(src_entry);
if (!php_array_merge(Z_ARRVAL_PP(dest_entry),