cvs: php4 /ext/standard array.c
| From: | Andrei Zmievski | Date: | Wed, 24 Apr 2002 15:01:54 +0000 |
| Subject: | cvs: php4 /ext/standard array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11389@lists.php.net to get a copy of this message | ||
andrei Wed Apr 24 11:01:54 2002 EDT
Modified files:
/php4/ext/standard array.c
Log:
Fix unwanted type conversion in array_merge_recursive (Bug #14990).
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.159 php4/ext/standard/array.c:1.160
--- php4/ext/standard/array.c:1.159 Tue Mar 12 02:20:00 2002
+++ php4/ext/standard/array.c Wed Apr 24 11:01:53 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.159 2002/03/12 07:20:00 sebastian Exp $ */
+/* $Id: array.c,v 1.160 2002/04/24 15:01:53 andrei Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1943,6 +1943,7 @@
array_init(return_value);
for (i=0; i<argc; i++) {
+ SEPARATE_ZVAL(args[i]);
convert_to_array_ex(args[i]);
php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(args[i]), recursive);
}