Skip to content

ext/intl: Reset IntlListFormatter error state in constructor #22931

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

Merged
LamentXU123 merged 1 commit into from
Aug 1, 2026
+30 −0
Merged

ext/intl: Reset IntlListFormatter error state in constructor #22931

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
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ PHP NEWS
. Fixed bug GH-22825 (DOMElement::setAttribute() fails silently when the DTD
declares a default value for the attribute). (iliaal)

- Intl:
. Fixed IntlListFormatter::__construct() leaving stale global error state
after successful calls. (Weilin Du)

- Opcache:
. Fixed GH-22693 (DT_TEXTREL in JIT-generated TLS access on x86_64).
(David Carlier)
Expand Down
3 changes: 3 additions & 0 deletions ext/intl/listformatter/listformatter_class.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ PHP_METHOD(IntlListFormatter, __construct)
zend_long type = INTL_LISTFORMATTER_FALLBACK_TYPE_AND;
zend_long width = INTL_LISTFORMATTER_FALLBACK_WIDTH_WIDE;
#endif

intl_errors_reset(LISTFORMATTER_ERROR_P(obj));

ZEND_PARSE_PARAMETERS_START(1, 3)
Z_PARAM_STRING(locale, locale_len)
Z_PARAM_OPTIONAL
Expand Down
23 changes: 23 additions & 0 deletions ext/intl/tests/listformatter/listformatter_constructor_error_reset.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
IntlListFormatter::__construct() resets stale errors
--EXTENSIONS--
intl
--FILE--
<?php
$formatter = new IntlListFormatter('en_US');
var_dump($formatter->format(["\x80"]));
var_dump(intl_get_error_code() === U_INVALID_CHAR_FOUND);

$formatter = new IntlListFormatter('en_US');
var_dump(intl_get_error_code());
var_dump(intl_get_error_message());
var_dump($formatter->getErrorCode());
var_dump($formatter->getErrorMessage());
?>
--EXPECT--
bool(false)
bool(true)
int(0)
string(12) "U_ZERO_ERROR"
int(0)
string(12) "U_ZERO_ERROR"
Loading