intl: Fix memory leak in IntlChar::getFC_NFKC_Closure()

iliaal · iliaal · commit d70568ea9f0d · 2026-06-08T07:20:02.000-04:00
Free the closure buffer before the UTF-8 conversion status check, which returns early on failure. Closes phpGH-22252
diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c
@@ -525,8 +525,8 @@ IC_METHOD(getFC_NFKC_Closure) {
 
 	error = U_ZERO_ERROR;
 	u8str = intl_convert_utf16_to_utf8(closure, closure_len, &error);
-	INTL_CHECK_STATUS(error, "Failed converting output to UTF8");
 	efree(closure);
+	INTL_CHECK_STATUS(error, "Failed converting output to UTF8");
 	RETVAL_NEW_STR(u8str);
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -525,8 +525,8 @@ IC_METHOD(getFC_NFKC_Closure) {`
`525`	`525`
`526`	`526`	`error = U_ZERO_ERROR;`
`527`	`527`	`u8str = intl_convert_utf16_to_utf8(closure, closure_len, &error);`
`528`		`- INTL_CHECK_STATUS(error, "Failed converting output to UTF8");`
`529`	`528`	`efree(closure);`
	`529`	`+ INTL_CHECK_STATUS(error, "Failed converting output to UTF8");`
`530`	`530`	`RETVAL_NEW_STR(u8str);`
`531`	`531`	`}`
`532`	`532`	`/* }}} */`