From 403b911fe6eb2ff589bf83fdfa0a7c333372850a Mon Sep 17 00:00:00 2001 From: David Carlier Date: Tue, 9 Jan 2024 19:28:15 +0000 Subject: [PATCH] ext/intl: backport `IntlDateFormatter` fix. --- ext/intl/dateformat/dateformat_create.cpp | 2 +- ext/intl/tests/gh12943.phpt | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 ext/intl/tests/gh12943.phpt diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp index 5c96f41fadf35..dbb2e8a6f6229 100644 --- a/ext/intl/dateformat/dateformat_create.cpp +++ b/ext/intl/dateformat/dateformat_create.cpp @@ -112,7 +112,7 @@ 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) { + if (locale.isBogus() || ((locale_len == 1 && locale_str[0] != 'C') || (locale_len > 1 && strlen(locale.getISO3Language()) == 0))) { goto error; } diff --git a/ext/intl/tests/gh12943.phpt b/ext/intl/tests/gh12943.phpt new file mode 100644 index 0000000000000..1a8856640acd3 --- /dev/null +++ b/ext/intl/tests/gh12943.phpt @@ -0,0 +1,15 @@ +--TEST-- +GitHub #12943 IntlDateFormatter::locale accepting "C". +--EXTENSIONS-- +intl +--FILE-- +getLocale(ULOC_VALID_LOCALE)); +--EXPECTF-- +string(%d) "%s"