cvs: php-src(PHP_5_2) /ext/standard array.c

andrei Sun Jul 30 03:31:18 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard array.c Log: Make array_merge(_recursive) handle binary keys safely. (Patch by Matt W) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.8&r2=1.308.2.21.2.9&diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.308.2.21.2.8 php-src/ext/standard/array.c:1.308.2.21.2.9 --- php-src/ext/standard/array.c:1.308.2.21.2.8 Mon Jul 24 18:18:33 2006 +++ php-src/ext/standard/array.c Sun Jul 30 03:31:18 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.308.2.21.2.8 2006/07/24 18:18:33 andrei Exp $ */ +/* $Id: array.c,v 1.308.2.21.2.9 2006/07/30 03:31:18 andrei Exp $ */ #include "php.h" #include "php_ini.h" @@ -2328,7 +2328,7 @@ } 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;