summaryrefslogtreecommitdiff
path: root/ext/standard/array.c
diff options
context:
space:
mode:
authorMoriyoshi Koizumi <moriyoshi@php.net>2002-11-15 02:18:12 +0000
committerMoriyoshi Koizumi <moriyoshi@php.net>2002-11-15 02:18:12 +0000
commit03222e4d82ffab5df9d2367b1bc2df841d048590 (patch)
tree897bbc37134f7e00096bed317e1e736e0292608d /ext/standard/array.c
parent54e893af5689bdb27a36f73b9d6d97dadb49ba06 (diff)
downloadphp-git-03222e4d82ffab5df9d2367b1bc2df841d048590.tar.gz
MFH
Diffstat (limited to 'ext/standard/array.c')
-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 e0906fc9e9..bbae1f915f 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -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),