diff options
| -rw-r--r-- | ext/standard/array.c | 14 | ||||
| -rw-r--r-- | ext/standard/tests/array/array_merge_recursive_variation5.phpt | 4 |
2 files changed, 15 insertions, 3 deletions
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"]=> |