Skip to content

ext/standard: Fix array_merge() with an empty array argument #24404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GromNaN wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ext/standard: Fix array_merge() with an empty array argument #24404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4275,15 +4275,20 @@ static zend_always_inline void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMET
ret = &args[0];
}
if (ret) {
if (HT_IS_PACKED(Z_ARRVAL_P(ret))) {
if (HT_IS_WITHOUT_HOLES(Z_ARRVAL_P(ret))) {
HashTable *ht = Z_ARRVAL_P(ret);
/* ZEND_LONG_MIN means no integer key yet, the next append uses index 0. */
zend_long next_free = ht->nNextFreeElement == ZEND_LONG_MIN ? 0 : ht->nNextFreeElement;

/* array_merge() renumbers integer keys from 0, so the next free index must match. */
if (HT_IS_PACKED(ht)) {
if (HT_IS_WITHOUT_HOLES(ht) && next_free == (zend_long) ht->nNumOfElements) {
RETURN_COPY(ret);
}
} else {
} else if (next_free == 0) {
bool copy = true;
zend_string *string_key;

ZEND_HASH_MAP_FOREACH_STR_KEY(Z_ARRVAL_P(ret), string_key) {
ZEND_HASH_MAP_FOREACH_STR_KEY(ht, string_key) {
if (!string_key) {
copy = false;
break;
Expand Down
34 changes: 34 additions & 0 deletions ext/standard/tests/array/array_merge_empty_array_result.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
--TEST--
array_merge() with an empty argument returns an array with a fresh next free index
--FILE--
<?php
// The result must behave like a fresh array: integer keys renumbered from 0.

$a = [1, 2, 3];
unset($a[2]);
$r = array_merge($a, []);
$r[] = 4;
var_dump($r);

$b = ['a' => 1];
$b[] = 2;
unset($b[0]);
$r = array_merge([], $b);
$r[] = 3;
var_dump($r);
?>
--EXPECT--
array(3) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(4)
}
array(2) {
["a"]=>
int(1)
[0]=>
int(3)
}
Loading