From 11cb016d391570c8aa0b2986b8242c14f9bd344a Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Mon, 16 Jun 2003 17:37:15 +0000 Subject: [PATCH] MFH: Fixed bug #24198 (Invalid recursion detection in array_merge_recurcive()) --- ext/standard/array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/standard/array.c b/ext/standard/array.c index 64c0ad84a2..597daf2508 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2001,7 +2001,7 @@ PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS if (recursive && zend_hash_find(dest, string_key, string_key_len, (void **)&dest_entry) == SUCCESS) { - if (*src_entry == *dest_entry) { + if (*src_entry == *dest_entry && ((*dest_entry)->refcount % 2)) { zend_error(E_WARNING, "%s(): recursion detected", get_active_function_name(TSRMLS_C)); return 0; -- 2.50.1