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

Fix GH-12282: IntlDateFormatter::construct should throw an exception is the locale field has an invalid value.

Browse source 
Close GH-12282
This commit is contained in:
David Carlier 2023-09-23 13:32:53 +01:00
parent 4f044e9238
commit a80db7b52a
3 changed files with 28 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 = 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 */
if (datefmt_process_calendar_arg(calendar_obj, calendar_long, calendar_is_null, locale, "datefmt_create",