Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit cb0b2a27e3f6 · 2025-06-01T11:38:51.000+02:00
* PHP-8.3:
  Fix memory leak in lookup_loc_range()
diff --git a/NEWS b/NEWS
@@ -24,6 +24,7 @@ PHP                                                                        NEWS
 
 - Intl:
   . Fix memory leak in intl_datetime_decompose() on failure. (nielsdos)
+  . Fix memory leak in locale lookup on failure. (nielsdos)
 
 - Phar:
   . Add missing filter cleanups on phar failure. (nielsdos)
diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
@@ -1488,6 +1488,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
`@@ -1488,6 +1488,7 @@ static zend_string* lookup_loc_range(const char* loc_range, HashTable* hash_arr,`
`1488`	`1488`	`zend_string_release_ex(can_loc_range, 0);`
`1489`	`1489`	`}`
`1490`	`1490`	`if(result == 0) {`
	`1491`	`+ efree(cur_loc_range);`
`1491`	`1492`	`intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "lookup_loc_range: unable to canonicalize lang_tag" , 0);`
`1492`	`1493`	`LOOKUP_CLEAN_RETURN(NULL);`
`1493`	`1494`	`}`