Merge branch 'PHP-8.5'

iliaal · iliaal · commit e9e2418d1cf6 · 2026-06-08T07:23:33.000-04:00
* PHP-8.5:
  intl: Fix memory leak in IntlChar::getFC_NFKC_Closure()
diff --git a/ext/intl/uchar/uchar.cpp b/ext/intl/uchar/uchar.cpp
@@ -541,8 +541,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
`@@ -541,8 +541,8 @@ IC_METHOD(getFC_NFKC_Closure) {`
`541`	`541`
`542`	`542`	`error = U_ZERO_ERROR;`
`543`	`543`	`u8str = intl_convert_utf16_to_utf8(closure, closure_len, &error);`
`544`		`- INTL_CHECK_STATUS(error, "Failed converting output to UTF8");`
`545`	`544`	`efree(closure);`
	`545`	`+ INTL_CHECK_STATUS(error, "Failed converting output to UTF8");`
`546`	`546`	`RETVAL_NEW_STR(u8str);`
`547`	`547`	`}`
`548`	`548`	`/* }}} */`