Fix GH-13094: range(9.9, '0') causes segmentation fault #13105
Closed
Conversation
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
`start_type + end_type < 2*IS_STRING` is not right, in this test case the types are start_type==5 (IS_DOUBLE), end_type==7 (IS_ARRAY). The IS_ARRAY type is a sentinel to disambiguate single-byte strings. The path must be taken when one of the types is not a string nor a single-byte string. Therefore, use < IS_STRING with an OR condition.
nielsdos
commented
Jan 9, 2024
| @@ -2924,8 +2924,8 @@ PHP_FUNCTION(range) | |||
|
|
|||
| /* If the range is given as strings, generate an array of characters. */ | |||
| if (start_type >= IS_STRING || end_type >= IS_STRING) { | |||
| /* If one of the inputs is NOT a string */ | |||
| if (UNEXPECTED(start_type + end_type < 2*IS_STRING)) { | |||
| /* If one of the inputs is NOT a string nor single-byte string */ | |||
There was a problem hiding this comment.
Gina, please double-check my edit to this comment :-)
There was a problem hiding this comment.
This took a hot minute, but I think this is correct, yes.
As the initial logic was that one of the inputs is a valid string (be single byte or not) and the other one is either an int or float. Thus it "wouldn't" be more than 2*IS_STRING in my head.
Girgias
approved these changes
Jan 9, 2024
| @@ -2924,8 +2924,8 @@ PHP_FUNCTION(range) | |||
|
|
|||
| /* If the range is given as strings, generate an array of characters. */ | |||
| if (start_type >= IS_STRING || end_type >= IS_STRING) { | |||
| /* If one of the inputs is NOT a string */ | |||
| if (UNEXPECTED(start_type + end_type < 2*IS_STRING)) { | |||
| /* If one of the inputs is NOT a string nor single-byte string */ | |||
There was a problem hiding this comment.
This took a hot minute, but I think this is correct, yes.
As the initial logic was that one of the inputs is a valid string (be single byte or not) and the other one is either an int or float. Thus it "wouldn't" be more than 2*IS_STRING in my head.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
start_type + end_type < 2*IS_STRINGis not right, in this test case the types are start_type==5 (IS_DOUBLE), end_type==7 (IS_ARRAY). The IS_ARRAY type is a sentinel to disambiguate single-byte strings. The path must be taken when one of the types is not a string nor a single-byte string. Therefore, use < IS_STRING with an OR condition.