]> granicus.if.org Git - php/commitdiff
Fix unwanted type conversion in array_merge_recursive (Bug #14990).
authorAndrei Zmievski <andrei@php.net>
Wed, 24 Apr 2002 15:01:53 +0000 (15:01 +0000)
committerAndrei Zmievski <andrei@php.net>
Wed, 24 Apr 2002 15:01:53 +0000 (15:01 +0000)
ext/standard/array.c

index 9216881f8bc358cfd1197e3e79a88c4853a9e64d..c0d967c24448fb01837c5ffa4d24b34fffcd8866 100644 (file)
@@ -1943,6 +1943,7 @@ static void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMETERS, int recursive)
        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);
        }