diff options
| author | Andrei Zmievski <andrei@php.net> | 2006-07-30 03:31:18 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2006-07-30 03:31:18 +0000 |
| commit | 3d7a1c39727865971e6fdc77fe6e00cb77cb1d9c (patch) | |
| tree | 3fd7f5cb32cd98964206e7cce7c58fa91c567749 /ext/standard/array.c | |
| parent | 3a75600dbba942caab0339da55084fd1e7de9884 (diff) | |
| download | php-git-3d7a1c39727865971e6fdc77fe6e00cb77cb1d9c.tar.gz | |
Make array_merge(_recursive) handle binary keys safely. (Patch by Matt W)
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 163db160ae..800bbddd8c 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -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; |