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

Merge branch 'PHP-8.2'

Browse source 
* PHP-8.2:
  ext/intl: Fix memory leak in MessageFormatter::format()
This commit is contained in:
George Peter Banyard 2023-07-12 15:44:58 +01:00
commit 2aaa7997a2
No known key found for this signature in database
GPG key ID: 3306078E3194AEBD
3 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -14,6 +14,9 @@ PHP NEWS
. Added zend_call_stack_get implementation for OpenBSD. (David Carlier)
. Fixed oss-fuzz #60411 (Fix double-compilation of arrow-functions). (ilutov)
- Intl:
. Fix memory leak in MessageFormatter::format() on failure. (Girgias)
- LDAP:
. Deprecate calling ldap_connect() with separate hostname and port.
(heiglandreas)

30
ext/intl/msgformat/msgformat_format.c
View file

@ -125,21 +125,27 @@ PHP_FUNCTION( msgfmt_format_message )
efree(spattern);
}
if (INTL_DATA_ERROR_CODE( mfo ) == U_PATTERN_SYNTAX_ERROR) {
char *msg = NULL;
smart_str parse_error_str;
parse_error_str = intl_parse_error_to_string( &parse_error );
spprintf( &msg, 0, "pattern syntax error (%s)", parse_error_str.s? ZSTR_VAL(parse_error_str.s) : "unknown parser error" );
smart_str_free( &parse_error_str );
/* Cannot use INTL_METHOD_CHECK_STATUS() as we need to free the message object formatter */
if (U_FAILURE(INTL_DATA_ERROR_CODE(mfo))) {
if (INTL_DATA_ERROR_CODE( mfo ) == U_PATTERN_SYNTAX_ERROR) {
char *msg = NULL;
smart_str parse_error_str;
parse_error_str = intl_parse_error_to_string( &parse_error );
spprintf( &msg, 0, "pattern syntax error (%s)", parse_error_str.s? ZSTR_VAL(parse_error_str.s) : "unknown parser error" );
smart_str_free( &parse_error_str );
intl_error_set_code( NULL, INTL_DATA_ERROR_CODE( mfo ) );
intl_errors_set_custom_msg( INTL_DATA_ERROR_P( mfo ), msg, 1 );
intl_error_set_code( NULL, INTL_DATA_ERROR_CODE( mfo ) );
intl_errors_set_custom_msg( INTL_DATA_ERROR_P( mfo ), msg, 1 );
efree( msg );
efree( msg );
} else {
intl_errors_set_custom_msg( INTL_DATA_ERROR_P(mfo), "Creating message formatter failed", 0 );
}
/* Reset custom error message as this is a static method that has no object */
intl_errors_reset(INTL_DATA_ERROR_P(mfo));
umsg_close(MSG_FORMAT_OBJECT(mfo));
RETURN_FALSE;
}
INTL_METHOD_CHECK_STATUS(mfo, "Creating message formatter failed");
}
msgfmt_do_format(mfo, args, return_value);

15
ext/intl/tests/gh11658.phpt Normal file
View file

@ -0,0 +1,15 @@
--TEST--
GitHub #11658 MessageFormatter::format() leaks memory
--EXTENSIONS--
intl
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
$s = MessageFormatter::formatMessage('en', 'some {wrong.format}', []);
var_dump($s);
?>
--EXPECTF--
Warning: MessageFormatter::formatMessage(): pattern syntax error (parse error at offset 6, after "some {", before or at "wrong.format}") in %s on line %d
bool(false)