From: Andrei Zmievski <andrei@php.net>
Date: Sun, 30 Jul 2006 03:31:18 +0000 (+0000)
Subject: Make array_merge(_recursive) handle binary keys safely. (Patch by Matt W)
X-Git-Tag: php-5.2.0RC2~154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d7a1c39727865971e6fdc77fe6e00cb77cb1d9c;p=php

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

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;