Skip to content

Optimize SplFixedArray::fromArray() for packed arrays #18196

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

Merged
merged 1 commit into from
Mar 30, 2025
Merged

Optimize SplFixedArray::fromArray() for packed arrays #18196

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
33 changes: 20 additions & 13 deletions ext/spl/spl_fixedarray.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,22 +730,29 @@ PHP_METHOD(SplFixedArray, fromArray)
zend_ulong num_index, max_index = 0;
zend_long tmp;

ZEND_HASH_FOREACH_KEY(Z_ARRVAL_P(data), num_index, str_index) {
if (str_index != NULL || (zend_long)num_index < 0) {
zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0, "array must contain only positive integer keys");
if (HT_IS_PACKED(Z_ARRVAL_P(data))) {
/* If there are no holes, then nNumUsed is the number of elements.
* If there are holes, then nNumUsed is the index of the last element. */
tmp = Z_ARRVAL_P(data)->nNumUsed;
} else {
ZEND_HASH_MAP_FOREACH_KEY(Z_ARRVAL_P(data), num_index, str_index) {
if (str_index != NULL || (zend_long)num_index < 0) {
zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0, "array must contain only positive integer keys");
RETURN_THROWS();
}

if (num_index > max_index) {
max_index = num_index;
}
} ZEND_HASH_FOREACH_END();

tmp = max_index + 1;
if (tmp <= 0) {
zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0, "integer overflow detected");
RETURN_THROWS();
}

if (num_index > max_index) {
max_index = num_index;
}
} ZEND_HASH_FOREACH_END();

tmp = max_index + 1;
if (tmp <= 0) {
zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0, "integer overflow detected");
RETURN_THROWS();
}

spl_fixedarray_init(&array, tmp);

ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(data), num_index, element) {
Expand Down
Loading