From 3d7a1c39727865971e6fdc77fe6e00cb77cb1d9c Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Sun, 30 Jul 2006 03:31:18 +0000 Subject: [PATCH] Make array_merge(_recursive) handle binary keys safely. (Patch by Matt W) --- ext/standard/array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.50.1