Merge branch 'PHP-8.4' into PHP-8.5

ndossche · ndossche · commit bb3559b2b5ed · 2025-10-18T10:27:32.000+02:00
* PHP-8.4:
  intl: Fix memory leak on error in locale_filter_matches()
diff --git a/ext/intl/locale/locale_methods.cpp b/ext/intl/locale/locale_methods.cpp
@@ -1287,6 +1287,7 @@ U_CFUNC PHP_FUNCTION(locale_filter_matches)
 		/* canonicalize lang_tag */
 		can_lang_tag = get_icu_value_internal( lang_tag , LOC_CANONICALIZE_TAG , &result ,  0);
 		if( result <=0) {
+			zend_string_release_ex( can_loc_range, false );
 			intl_error_set(NULL, status, "unable to canonicalize lang_tag");
 			RETURN_FALSE;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1287,6 +1287,7 @@ U_CFUNC PHP_FUNCTION(locale_filter_matches)`
`1287`	`1287`	`/* canonicalize lang_tag */`
`1288`	`1288`	`can_lang_tag = get_icu_value_internal( lang_tag , LOC_CANONICALIZE_TAG , &result , 0);`
`1289`	`1289`	`if( result <=0) {`
	`1290`	`+ zend_string_release_ex( can_loc_range, false );`
`1290`	`1291`	`intl_error_set(NULL, status, "unable to canonicalize lang_tag");`
`1291`	`1292`	`RETURN_FALSE;`
`1292`	`1293`	`}`