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

Make array_merge(_recursive) handle binary keys safely. (Patch by Matt W)

Browse Source
This commit is contained in:
Andrei Zmievski 2006-07-30 03:31:18 +00:00
parent 3a75600dbb
commit 3d7a1c3972
1 changed files with 1 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

@ -2328,7 +2328,7 @@ PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS
} else {
(*src_entry)->refcount++;
zend_hash_update(dest, string_key, strlen(string_key)+1,
zend_hash_update(dest, string_key, string_key_len,
src_entry, sizeof(zval *), NULL);
}
break;