php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source
This commit is contained in:
David Carlier
2025-07-27 13:50:30 +01:00
parent f7ca8138e7 87b4030503
commit f4ad6ea287
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ext/intl/msgformat/msgformat_parse.c
View File

@@ -127,10 +127,11 @@ PHP_FUNCTION( msgfmt_parse_message )
if(spattern && spattern_len) {
efree(spattern);
}
INTL_METHOD_CHECK_STATUS(mfo, "Creating message formatter failed");
INTL_METHOD_CHECK_STATUS_OR_GOTO(mfo, "Creating message formatter failed", clean);
msgfmt_do_parse(mfo, source, src_len, return_value);
clean:
/* drop the temporary formatter */
msgformat_data_free(&mfo->mf_data);
}

28
ext/intl/tests/gh19261.phpt Normal file
View File

@@ -0,0 +1,28 @@
--TEST--
MessageFormatter::parseMessage() with invalid locale
--EXTENSIONS--
intl
--CREDITS--
girgias@php.net
--FILE--
<?php
$locale = 'root';
$fmt = '{0,whatever} would not work!';
$str = 'failing';
$m = MessageFormatter::parseMessage($locale, $fmt, $str);
var_dump($m);
var_dump(intl_get_error_message());
$m = msgfmt_parse_message($locale, $fmt, $str);
var_dump($m);
var_dump(intl_get_error_message());
?>
--EXPECT--
bool(false)
string(59) "Creating message formatter failed: U_ILLEGAL_ARGUMENT_ERROR"
bool(false)
string(59) "Creating message formatter failed: U_ILLEGAL_ARGUMENT_ERROR"