Fixed GH-19261: msgfmt_parse_message leaks on message format failure.

devnexen · devnexen · commit 8ab1846375ae · 2025-07-27T12:20:21.000+01:00
diff --git a/ext/intl/msgformat/msgformat_parse.c b/ext/intl/msgformat/msgformat_parse.c
@@ -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);
 }

Original file line number	Diff line number	Diff line change
`@@ -127,10 +127,11 @@ PHP_FUNCTION( msgfmt_parse_message )`
`127`	`127`	`if(spattern && spattern_len) {`
`128`	`128`	`efree(spattern);`
`129`	`129`	`}`
`130`		`- INTL_METHOD_CHECK_STATUS(mfo, "Creating message formatter failed");`
	`130`	`+ INTL_METHOD_CHECK_STATUS_OR_GOTO(mfo, "Creating message formatter failed", clean);`
`131`	`131`
`132`	`132`	`msgfmt_do_parse(mfo, source, src_len, return_value);`
`133`	`133`
	`134`	`+clean:`
`134`	`135`	`/* drop the temporary formatter */`
`135`	`136`	`msgformat_data_free(&mfo->mf_data);`
`136`	`137`	`}`