diff options
| author | Antony Dovgal <tony2001@php.net> | 2008-01-23 11:20:00 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2008-01-23 11:20:00 +0000 |
| commit | f6169ad7ca51f29d07dbc0ffc8108585bdb4090a (patch) | |
| tree | 64a6a1ab5532052790195c0f01525e2b2e7ba54d | |
| parent | bcd286cfa1ad59c42032dbd94f36e154dea3d451 (diff) | |
| download | php-git-f6169ad7ca51f29d07dbc0ffc8108585bdb4090a.tar.gz | |
fix #43559 (array_merge_recursive() doesn't behave as expected with duplicate NULL values)
patch by Felipe
| -rw-r--r-- | ext/standard/array.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index e7345fc188..2a99e960f0 100644 --- 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++; } |