Fix GH-11952: better locale strings canonicalization for IntlDateFormatter and NumberFormatter #19593
+133
−6
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
6caa975 to
8564487
Compare
devnexen
reviewed
Aug 26, 2025
| UErrorCode status = U_ZERO_ERROR; | ||
| int32_t canonicalized_len; | ||
|
|
||
| if (!locale || strlen(locale) == 0) { |
There was a problem hiding this comment.
For a (very) quick glance, is there a situation when it can actually happens ?
There was a problem hiding this comment.
You're right it seems fine, in the worst case scenario, uloc_getDefault() is called. I removed this defensive part.
There was a problem hiding this comment.
Nice. I ll have a better look sometime tonight. Cheers !
…ormatter and NumberFormatter
8564487 to
7a493fd
Compare
devnexen
reviewed
Aug 26, 2025
| @@ -110,7 +125,16 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_error_handlin | |||
| if (locale_len == 0) { | |||
| locale_str = (char *) intl_locale_get_default(); | |||
| } | |||
| locale = Locale::createFromName(locale_str); | |||
|
|
|||
| char* canonicalized_locale = NULL; | |||
There was a problem hiding this comment.
nit: we re dealing with C99 (C11 I heard ?), you can simplify like this
char *canonicalized_locale = canonicalize_locale_string(locale_str);
const char *final_locale = canonicalized_locale ? canonicalized_locale : locale_str;
const char *stored_locale = canonicalized_locale ? canonicalized_locale : locale_str;
devnexen
reviewed
Aug 26, 2025
| @@ -36,6 +37,20 @@ extern "C" { | |||
| #include "dateformat_helpers.h" | |||
| #include "zend_exceptions.h" | |||
|
|
|||
| static char* canonicalize_locale_string(const char* locale) { | |||
There was a problem hiding this comment.
is it possible to factorise it somewhere ? e.g. php_intl
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.
Fix #11942