Skip to content

Add array size maximum to array_diff() #21449

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
ndossche wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add array size maximum to array_diff() #21449

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
7 changes: 6 additions & 1 deletion ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5846,7 +5846,7 @@ PHP_FUNCTION(array_diff)
{
zval *args;
uint32_t argc, i;
uint32_t num;
uint64_t num;
HashTable exclude;
zval *value;
zend_string *str, *tmp_str, *key;
Expand Down Expand Up @@ -5936,6 +5936,11 @@ PHP_FUNCTION(array_diff)
return;
}

if (UNEXPECTED(num >= HT_MAX_SIZE)) {
zend_throw_error(NULL, "The total number of elements must be lower than %u", HT_MAX_SIZE);
RETURN_THROWS();
}

ZVAL_NULL(&dummy);
/* create exclude map */
zend_hash_init(&exclude, num, NULL, NULL, 0);
Expand Down
Loading