Fix memleak on failure in collator_get_sort_key()

nielsdos · nielsdos · commit b495ce03716b · 2025-07-15T20:36:56.000+02:00
Closes GH-19138.
diff --git a/NEWS b/NEWS
@@ -17,6 +17,9 @@ PHP                                                                        NEWS
     (nielsdos)
   . Remove incorrect string release. (nielsdos)
 
+- Intl:
+  . Fix memleak on failure in collator_get_sort_key(). (nielsdos)
+
 - LDAP:
   . Fixed GH-18902 ldap_exop/ldap_exop_sync assert triggered on empty
     request OID. (David Carlier)
diff --git a/ext/intl/collator/collator_sort.c b/ext/intl/collator/collator_sort.c
@@ -556,6 +556,7 @@ PHP_FUNCTION( collator_get_sort_key )
 	key_len = ucol_getSortKey(co->ucoll, ustr, ustr_len, (uint8_t*)ZSTR_VAL(key_str), key_len);
 	efree( ustr );
 	if(!key_len) {
+		zend_string_efree(key_str);
 		RETURN_FALSE;
 	}
 	ZSTR_LEN(key_str) = key_len - 1;

Original file line number	Diff line number	Diff line change
`@@ -556,6 +556,7 @@ PHP_FUNCTION( collator_get_sort_key )`
`556`	`556`	`key_len = ucol_getSortKey(co->ucoll, ustr, ustr_len, (uint8_t*)ZSTR_VAL(key_str), key_len);`
`557`	`557`	`efree( ustr );`
`558`	`558`	`if(!key_len) {`
	`559`	`+ zend_string_efree(key_str);`
`559`	`560`	`RETURN_FALSE;`
`560`	`561`	`}`
`561`	`562`	`ZSTR_LEN(key_str) = key_len - 1;`