archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3'

Browse source
This commit is contained in:
David Carlier 2023-12-22 17:28:29 +00:00
commit 5455c3fc01
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/intl/dateformat/dateformat_create.cpp
View file

@ -112,8 +112,8 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_error_handlin
}
locale = Locale::createFromName(locale_str);
/* get*Name accessors being set does not preclude being bogus */
if (locale.isBogus() || strlen(locale.getISO3Language()) == 0) {
zend_argument_value_error(1, "\"%s\" is invalid", locale_str);
if (locale.isBogus() || ((locale_len == 1 && locale_str[0] != 'C') && strlen(locale.getISO3Language()) == 0)) {
zend_argument_value_error(1, "\"%s\" is invalid", locale_str);
return FAILURE;
}