tony2001 Fri Aug 12 12:49:24 2005 EDT
Modified files:
/php-src/ext/standard array.c
Log:
fix array_merge() adding one superfluous byte to the key
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.312&r2=1.313&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.312 php-src/ext/standard/array.c:1.313
--- php-src/ext/standard/array.c:1.312 Thu Aug 11 19:35:56 2005
+++ php-src/ext/standard/array.c Fri Aug 12 12:49:20 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.312 2005/08/11 23:35:56 andrei Exp $ */
+/* $Id: array.c,v 1.313 2005/08/12 16:49:20 tony2001 Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2364,7 +2364,7 @@
} else {
(*src_entry)->refcount++;
- zend_u_hash_update(dest, utype,
string_key, string_key_len+1,
+ zend_u_hash_update(dest, utype,
string_key, string_key_len,
src_entry, sizeof(zval *), NULL);
}
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
