fix #43559 (array_merge_recursive() doesn't behave as expected with duplicate NULL...

patch by Felipe

diff --git a/ext/standard/array.c b/ext/standard/array.c
index e7345fc1880e3907111462cf71c149e70812e996..2a99e960f09f740ad6cdc423a3462d9ff6cff92c 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2397,8 +2397,18 @@ ukey:
                                        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++;
                                        }