Skip to content

standard: Remove redundant code in range() #20432

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 2 commits into from
Nov 10, 2025
+8 −14
Merged

standard: Remove redundant code in range() #20432

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52123ae
standard: Remove redundant code in range()
ndossche Nov 8, 2025
08478c7
[ci skip] comment
ndossche Nov 9, 2025
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
22 changes: 8 additions & 14 deletions ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3040,18 +3040,18 @@ PHP_FUNCTION(range)
if (start_type == IS_STRING || end_type == IS_STRING) {
php_error_docref(NULL, E_WARNING, "Argument #3 ($step) must be of type int when generating an array"
" of characters, inputs converted to 0");
}
if (UNEXPECTED(EG(exception))) {
RETURN_THROWS();
if (UNEXPECTED(EG(exception))) {
RETURN_THROWS();
}
}
end_type = IS_LONG;
start_type = IS_LONG;
goto handle_numeric_inputs;
}

/* Generate array of characters */
unsigned char low = (unsigned char)Z_STRVAL_P(user_start)[0];
unsigned char high = (unsigned char)Z_STRVAL_P(user_end)[0];
/* Generate array of characters, as ints to make bounds checking possible in the loop condition */
int low = Z_STRVAL_P(user_start)[0];
int high = Z_STRVAL_P(user_end)[0];

/* Decreasing char range */
if (low > high) {
Expand All @@ -3062,12 +3062,9 @@ PHP_FUNCTION(range)
array_init_size(return_value, (uint32_t)(((low - high) / step) + 1));
zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
for (; low >= high; low -= (unsigned int)step) {
for (; low >= high; low -= step) {
ZEND_HASH_FILL_SET_INTERNED_STR(ZSTR_CHAR(low));
ZEND_HASH_FILL_NEXT();
if (((signed int)low - step) < 0) {
break;
}
}
} ZEND_HASH_FILL_END();
} else if (high > low) { /* Increasing char range */
Expand All @@ -3080,12 +3077,9 @@ PHP_FUNCTION(range)
array_init_size(return_value, (uint32_t)(((high - low) / step) + 1));
zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
for (; low <= high; low += (unsigned int)step) {
for (; low <= high; low += step) {
ZEND_HASH_FILL_SET_INTERNED_STR(ZSTR_CHAR(low));
ZEND_HASH_FILL_NEXT();
if (((signed int)low + step) > 255) {
break;
}
}
} ZEND_HASH_FILL_END();
} else {
Expand Down