archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +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-09-23 20:13:45 +01:00
commit ab22571981
2 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,6 +111,11 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_error_handlin
locale_str = (char *) intl_locale_get_default(); locale_str = (char *) intl_locale_get_default();
} }
locale = Locale::createFromName(locale_str); locale = Locale::createFromName(locale_str);
/* get*Name accessors being set does not preclude being bogus */
if (locale.isBogus() || strlen(locale.getISO3Language()) == 0) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_create: invalid locale", 0);
return FAILURE;
}
/* process calendar */ /* process calendar */
if (datefmt_process_calendar_arg(calendar_obj, calendar_long, calendar_is_null, locale, "datefmt_create", if (datefmt_process_calendar_arg(calendar_obj, calendar_long, calendar_is_null, locale, "datefmt_create",

21
ext/intl/tests/gh12282.phpt Normal file
View file

@ -0,0 +1,21 @@
--TEST--
GitHub #12282 IntlDateFormatter::locale with invalid value.
--EXTENSIONS--
intl
--FILE--
<?php
try {
new IntlDateFormatter(
'xx',
IntlDateFormatter::FULL,
IntlDateFormatter::FULL,
null,
null,
'w'
);
} catch (\IntlException $e) {
echo $e->getMessage();
}
--EXPECT--
datefmt_create: invalid locale: U_ILLEGAL_ARGUMENT_ERROR