mirror of
https://github.com/php/php-src.git
synced 2026-04-29 19:23:22 +02:00
Gina Peter Banyard
6600d0e00f
This is a comprehensive refactoring of the error mechanism of the Intl extension. By moving the prefixing of the current method/function being executed to actual error message creation by accessing the execution context, we get the following benefits: - Accurate error messages indicating *what* call caused the error - As we *always* "copy" the message, the `copyMsg` arg becomes unused, meaning we can reduce the size of the `intl_error` struct by 4 bytes. - Saving it as a zend_string means we know the length of the message - Remove the need to pass around a "function name" `char*` across multiple calls - Use Intl's exception mechanism to generate exceptions for constructor call - This removes the need for replacing the error handler - Which didn't do anything anyway in silent mode, which required throwing non-descriptive exceptions
24 lines
751 B
PHP
24 lines
751 B
PHP
--TEST--
|
|
Bug #62017: datefmt_create with incorrectly encoded timezone leaks pattern
|
|
--EXTENSIONS--
|
|
intl
|
|
--FILE--
|
|
<?php
|
|
try {
|
|
datefmt_create('', IntlDateFormatter::NONE, IntlDateFormatter::NONE, "\xFF",
|
|
IntlDateFormatter::GREGORIAN, 'a');
|
|
} catch (Throwable $e) {
|
|
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
|
|
}
|
|
|
|
try {
|
|
new IntlDateFormatter('', IntlDateFormatter::NONE, IntlDateFormatter::NONE, "Europe/Lisbon",
|
|
IntlDateFormatter::GREGORIAN, "\x80");
|
|
} catch (Throwable $e) {
|
|
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
|
|
}
|
|
?>
|
|
--EXPECT--
|
|
IntlException: datefmt_create(): Time zone identifier given is not a valid UTF-8 string
|
|
IntlException: IntlDateFormatter::__construct(): error converting pattern to UTF-16
|