Merge branch 'PHP-8.4' into PHP-8.5

iliaal · iliaal · commit 63c3394005e3 · 2026-06-08T07:21:46.000-04:00
* PHP-8.4:
  intl: Fix memory leak in IntlChar::getFC_NFKC_Closure()
diff --git a/ext/intl/uchar/uchar.cpp b/ext/intl/uchar/uchar.cpp
@@ -527,8 +527,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
`@@ -527,8 +527,8 @@ IC_METHOD(getFC_NFKC_Closure) {`
`527`	`527`
`528`	`528`	`error = U_ZERO_ERROR;`
`529`	`529`	`u8str = intl_convert_utf16_to_utf8(closure, closure_len, &error);`
`530`		`- INTL_CHECK_STATUS(error, "Failed converting output to UTF8");`
`531`	`530`	`efree(closure);`
	`531`	`+ INTL_CHECK_STATUS(error, "Failed converting output to UTF8");`
`532`	`532`	`RETVAL_NEW_STR(u8str);`
`533`	`533`	`}`
`534`	`534`	`/* }}} */`