Merge branch 'PHP-8.4'

ndossche · ndossche · commit 233e33fe68de · 2025-06-01T11:39:03.000+02:00
* PHP-8.4:
  Fix memory leak in lookup_loc_range()
diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
@@ -1492,6 +1492,7 @@ static zend_string* lookup_loc_range(const char* loc_range, HashTable* hash_arr,
 		zend_string_release_ex(can_loc_range, 0);
 	}
 	if(result == 0) {
+		efree(cur_loc_range);
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "lookup_loc_range: unable to canonicalize lang_tag" , 0);
 		LOOKUP_CLEAN_RETURN(NULL);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1492,6 +1492,7 @@ static zend_string* lookup_loc_range(const char* loc_range, HashTable* hash_arr,`
`1492`	`1492`	`zend_string_release_ex(can_loc_range, 0);`
`1493`	`1493`	`}`
`1494`	`1494`	`if(result == 0) {`
	`1495`	`+ efree(cur_loc_range);`
`1495`	`1496`	`intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "lookup_loc_range: unable to canonicalize lang_tag" , 0);`
`1496`	`1497`	`LOOKUP_CLEAN_RETURN(NULL);`
`1497`	`1498`	`}`