Skip to content

ext/intl: Fix memory leak in MessageFormatter::format() #11658

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

Closed
wants to merge 1 commit into from
Closed

ext/intl: Fix memory leak in MessageFormatter::format() #11658

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
34 changes: 20 additions & 14 deletions ext/intl/msgformat/msgformat_format.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

intl_error_set_code( NULL, INTL_DATA_ERROR_CODE( mfo ) );
intl_errors_set_custom_msg( INTL_DATA_ERROR_P( mfo ), msg, 1 );

efree( msg );
/* 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 );

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);

Expand Down
15 changes: 15 additions & 0 deletions ext/intl/tests/gh11658.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)