From: Antony Dovgal <tony2001@php.net>
Date: Wed, 23 Jan 2008 12:09:52 +0000 (+0000)
Subject: MFH: fix #43559 (array_merge_recursive() doesn't behave as expected with duplicate... 
X-Git-Tag: RELEASE_1_3_1~317
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67c8d8d95ede1fcbf71ed7f9fdc7b43ce2b17f64;p=php

MFH: fix #43559 (array_merge_recursive() doesn't behave as expected with duplicate NULL values)
patch by Felipe
---

diff --git a/ext/standard/array.c b/ext/standard/array.c
index c7f2c3a30a..9283de508a 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2197,8 +2197,18 @@ PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS
 					SEPARATE_ZVAL(dest_entry);
 					SEPARATE_ZVAL(src_entry);
 
-					convert_to_array_ex(dest_entry);
-					convert_to_array_ex(src_entry);
+					if (Z_TYPE_PP(dest_entry) == IS_NULL) {
+						convert_to_array_ex(dest_entry);
+						add_next_index_null(*dest_entry);
+					} else {
+						convert_to_array_ex(dest_entry);
+					}
+					if (Z_TYPE_PP(src_entry) == IS_NULL) {
+						convert_to_array_ex(src_entry);
+						add_next_index_null(*src_entry);
+					} else {
+						convert_to_array_ex(src_entry);
+					}
 					if (thash) {
 						thash->nApplyCount++;
 					}
diff --git a/ext/standard/tests/array/array_merge_recursive_variation5.phpt b/ext/standard/tests/array/array_merge_recursive_variation5.phpt
index 6a6a50140f..3b251220ea 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation5.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation5.phpt
@@ -374,8 +374,10 @@ array(8) {
   object(classA)#%d (0) {
   }
   ["string"]=>
-  array(1) {
+  array(2) {
     [0]=>
+    NULL
+    [1]=>
     string(5) "hello"
   }
   ["resource"]=>