iliaa Sun Oct 5 15:37:08 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard array.c
Log:
MFH: Fixed clobbering of the source array, when merging complex
multi-dimensional arrays. Bug reported by Lukas Smith.
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.199.2.28 php-src/ext/standard/array.c:1.199.2.29
--- php-src/ext/standard/array.c:1.199.2.28 Thu Oct 2 18:22:14 2003
+++ php-src/ext/standard/array.c Sun Oct 5 15:37:06 2003
@@ -22,7 +22,7 @@
*/
-/* $Id: array.c,v 1.199.2.28 2003/10/02 22:22:14 moriyoshi Exp $ */
+/* $Id: array.c,v 1.199.2.29 2003/10/05 19:37:06 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2005,6 +2005,8 @@
return 0;
}
SEPARATE_ZVAL(dest_entry);
+ SEPARATE_ZVAL(src_entry);
+
convert_to_array_ex(dest_entry);
convert_to_array_ex(src_entry);
if (!php_array_merge(Z_ARRVAL_PP(dest_entry),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
