summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoriyoshi Koizumi <moriyoshi@php.net>2002-11-15 02:16:41 +0000
committerMoriyoshi Koizumi <moriyoshi@php.net>2002-11-15 02:16:41 +0000
commitfb20eae7fc81088f3d8e8b3f4f5ee497066d1227 (patch)
tree8d24eed315287a3b9f80d4cb63a5fba743ef9b4e
parentac209557ddd41d03333461092a28622b75cc37e0 (diff)
downloadphp-git-fb20eae7fc81088f3d8e8b3f4f5ee497066d1227.tar.gz
Fixed bug #20381
-rw-r--r--ext/standard/array.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c
index a5226c52ab..821c71c5ea 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -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),