Skip to content

ext/intl: Fix Locale::lookup() fallback on invalid language tags #22306

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

Open
LamentXU123 wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+51 −4
Open

ext/intl: Fix Locale::lookup() fallback on invalid language tags #22306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ PHP NEWS
for invalid display types. (Weilin Du)
. Fixed Spoofchecker restriction-level APIs to only be exposed with ICU 53
and later. (Graham Campbell)
. Fixed Locale::lookup() and locale_lookup() to return NULL instead of the
fallback locale when a language tag cannot be canonicalized. (Weilin Du)

- mysqli:
. Fix stmt->query leak in mysqli_execute_query() validation errors.
Expand Down
18 changes: 14 additions & 4 deletions ext/intl/locale/locale_methods.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,14 +1435,15 @@ static zend_string* lookup_loc_range(const char* loc_range, HashTable* hash_arr,
zend_argument_type_error(2, "must only contain string values");
LOOKUP_CLEAN_RETURN(NULL);
}
cur_arr[cur_arr_len*2] = estrndup(Z_STRVAL_P(ele_value), Z_STRLEN_P(ele_value));
result = strToMatch(Z_STRVAL_P(ele_value), cur_arr[cur_arr_len*2]);
i = cur_arr_len*2;
cur_arr[i] = estrndup(Z_STRVAL_P(ele_value), Z_STRLEN_P(ele_value));
cur_arr_len++;
result = strToMatch(Z_STRVAL_P(ele_value), cur_arr[i]);
if(result == 0) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "lookup_loc_range: unable to canonicalize lang_tag", 0);
LOOKUP_CLEAN_RETURN(NULL);
}
cur_arr[cur_arr_len*2+1] = Z_STRVAL_P(ele_value);
cur_arr_len++ ;
cur_arr[i+1] = Z_STRVAL_P(ele_value);
} ZEND_HASH_FOREACH_END(); /* end of for */

/* Canonicalize array elements */
Expand Down Expand Up @@ -1562,6 +1563,15 @@ PHP_FUNCTION(locale_lookup)
}

result_str = lookup_loc_range(loc_range, hash_arr, boolCanonical);
if (EG(exception)) {
RETURN_THROWS();
}
if (U_FAILURE(intl_error_get_code(NULL))) {
if (result_str) {
zend_string_release_ex(result_str, 0);
}
RETURN_NULL();
}
if(result_str == NULL || ZSTR_VAL(result_str)[0] == '\0') {
if( fallback_loc_str ) {
result_str = zend_string_copy(fallback_loc_str);
Expand Down
35 changes: 35 additions & 0 deletions ext/intl/tests/locale_lookup_invalid_language_tag.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
--TEST--
Locale::lookup() returns null for invalid language tags
--EXTENSIONS--
intl
--FILE--
<?php

var_dump(Locale::lookup([''], 'de-DE', false, 'en-US'));
var_dump(intl_get_error_message());

var_dump(locale_lookup([''], 'de-DE', false, 'en-US'));
var_dump(intl_get_error_message());

ini_set('intl.use_exceptions', '1');

try {
Locale::lookup([''], 'de-DE', false, 'en-US');
} catch (IntlException $e) {
echo $e->getMessage(), PHP_EOL;
}

try {
locale_lookup([''], 'de-DE', false, 'en-US');
} catch (IntlException $e) {
echo $e->getMessage(), PHP_EOL;
}

?>
--EXPECT--
NULL
string(75) "lookup_loc_range: unable to canonicalize lang_tag: U_ILLEGAL_ARGUMENT_ERROR"
NULL
string(75) "lookup_loc_range: unable to canonicalize lang_tag: U_ILLEGAL_ARGUMENT_ERROR"
lookup_loc_range: unable to canonicalize lang_tag
lookup_loc_range: unable to canonicalize lang_tag
Loading