Fix GH-12243, segfault on IntlDateFormatter::construct with dateType #12245
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
devnexen
force-pushed
the
fix_intl_date_formatter_sigsegv
branch
from
da353ca to
866d20f
Compare
Girgias
reviewed
Sep 20, 2023
| return FAILURE; | ||
| } | ||
| if (date_type == UDAT_PATTERN && time_type != UDAT_PATTERN) { | ||
| intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_create: invalid time format style, UDAT_PATTERN expected", 0); |
There was a problem hiding this comment.
The error message is confusing here, I think something along the usual line of time format must be UDAT_PATTERN if date format is UDAT_PATTERN is clearer.
May or may not make sense to convert this to a ValueError in master
| <?php | ||
|
|
||
| $datetime = new \DateTime('2017-05-12 23:11:00 GMT+2'); | ||
| static $UDAT_PATTERN = -2; |
There was a problem hiding this comment.
Feels like this constant should also be defined in the future?
set to UDAT_PATTERN but not timeType. udat_open expects its timeStyle's argument to be set to UDAT_PATTERN when dateStyle is, regardless if there an actual pattern or not.
devnexen
force-pushed
the
fix_intl_date_formatter_sigsegv
branch
from
866d20f to
2f9d3f9
Compare
Girgias
approved these changes
Sep 20, 2023
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.
set to UDAT_PATTERN but not timeType.
udat_open expects its timeStyle's argument to be set to UDAT_PATTERN
when dateStyle is, regardless if there an actual pattern or not.