]> granicus.if.org Git - php/commitdiff
Fixed bug #20381
authorMoriyoshi Koizumi <moriyoshi@php.net>
Fri, 15 Nov 2002 02:16:41 +0000 (02:16 +0000)
committerMoriyoshi Koizumi <moriyoshi@php.net>
Fri, 15 Nov 2002 02:16:41 +0000 (02:16 +0000)
ext/standard/array.c

index a5226c52abbd301d083166a783dd92d199598604..821c71c5ea0fb5011d5254428ea04a9a9b1bf2b9 100644 (file)
@@ -2008,6 +2008,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),