]> granicus.if.org Git - php/commitdiff
MFH
authorMoriyoshi Koizumi <moriyoshi@php.net>
Fri, 15 Nov 2002 02:18:12 +0000 (02:18 +0000)
committerMoriyoshi Koizumi <moriyoshi@php.net>
Fri, 15 Nov 2002 02:18:12 +0000 (02:18 +0000)
ext/standard/array.c

index e0906fc9e9a5dfa1b9c1bd4edf09391b07c1a047..bbae1f915f2b5e6982b9551b653e6298c46fd30a 100644 (file)
@@ -1996,6 +1996,7 @@ PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS
                                                                   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),