[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard array.c

[Moriyoshi Koizumi]

moriyoshi               Thu Nov 14 21:18:12 2002 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/standard  array.c 
  Log:
  MFH
  
  
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.199 php4/ext/standard/array.c:1.199.2.1
--- php4/ext/standard/array.c:1.199     Wed Nov 13 08:31:32 2002
+++ php4/ext/standard/array.c   Thu Nov 14 21:18:12 2002
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.199 2002/11/13 13:31:32 john Exp $ */
+/* $Id: array.c,v 1.199.2.1 2002/11/15 02:18:12 moriyoshi Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1996,6 +1996,7 @@
                                                                   
get_active_function_name(TSRMLS_C));
                                                return 0;
                                        }
+                                       SEPARATE_ZVAL(dest_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