-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Avoid fatal error condition in absint() #12917
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.
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
josephscott
wants to merge
5
commits into
WordPress:trunk
Choose a base branch
from
josephscott:65826/absint-check-return-value
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+146
−13
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e549981
Avoid fatal error condition in absint()
josephscott 9cd520c
Merge branch 'trunk' into 65826/absint-check-return-value
josephscott d3b4f6b
Catch more conditions
josephscott d58d307
Update src/wp-includes/load.php
josephscott b3ddef4
Merge branch 'trunk' into 65826/absint-check-return-value
josephscott File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1460,14 +1460,44 @@ function is_multisite() { | |
| /** | ||
| * Converts a value to non-negative integer. | ||
| * | ||
| * Values outside of the range of an integer are clamped to `PHP_INT_MAX`. | ||
| * | ||
| * @since 2.5.0 | ||
| * @since 7.1.0 Out of range values are clamped to `PHP_INT_MAX` instead of | ||
| * being cast to an undefined value. | ||
| * | ||
| * @param mixed $maybeint Data you wish to have converted to a non-negative integer. | ||
| * @return int A non-negative integer. | ||
| * @phpstan-return non-negative-int | ||
| */ | ||
| function absint( $maybeint ): int { | ||
| return abs( (int) $maybeint ); | ||
| /* | ||
| * Casting an out of range float to an integer is undefined, and raises a | ||
| * warning as of PHP 8.5. Numeric strings do not need this treatment, as | ||
| * casting those already clamps to PHP_INT_MAX or PHP_INT_MIN. | ||
| */ | ||
| if ( is_float( $maybeint ) ) { | ||
| if ( is_nan( $maybeint ) ) { | ||
| return 0; | ||
| } | ||
|
|
||
| if ( abs( $maybeint ) >= (float) PHP_INT_MAX ) { | ||
| return PHP_INT_MAX; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this trigger a warning as is done in PHP 8.5+ when attempting to cast a float larger than |
||
| } | ||
| } | ||
|
|
||
| $intval = (int) $maybeint; | ||
|
|
||
| /* | ||
| * PHP_INT_MIN is the only integer whose absolute value is larger than | ||
| * PHP_INT_MAX, which would make abs() return a float. Clamping it to | ||
| * -PHP_INT_MAX first keeps the result within the integer range. | ||
| */ | ||
| if ( PHP_INT_MIN === $intval ) { | ||
| return PHP_INT_MAX; | ||
| } | ||
|
|
||
| return abs( $intval ); | ||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about something like this to short-circuit before even trying to go further?
Including
boolhere sincetruepassed toabs()is1, andfalseis0.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that would be a BC break, because that would return
0for a string that PHP would have parsed into anint.For example, send
999 stuffthroughabsint()- https://3v4l.org/3M0ZfThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right you are. OK, in that case, what about just short-circuiting if it isn't a scalar?