Fix memory leak in lookup_loc_range()

nielsdos · nielsdos · commit d39d261b7eba · 2025-06-01T11:38:24.000+02:00
Closes phpGH-18723.
diff --git a/NEWS b/NEWS
@@ -17,6 +17,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
@@ -1499,6 +1499,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
`@@ -1499,6 +1499,7 @@ static zend_string* lookup_loc_range(const char* loc_range, HashTable* hash_arr,`
`1499`	`1499`	`zend_string_release_ex(can_loc_range, 0);`
`1500`	`1500`	`}`
`1501`	`1501`	`if(result == 0) {`
	`1502`	`+ efree(cur_loc_range);`
`1502`	`1503`	`intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "lookup_loc_range: unable to canonicalize lang_tag" , 0);`
`1503`	`1504`	`LOOKUP_CLEAN_RETURN(NULL);`
`1504`	`1505`	`}`