php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  ext/intl: Fix return value on failure for resourcebundle count handler
This commit is contained in:
Gina Peter Banyard
2025-07-28 15:35:47 +01:00
parent 19c84e2687 6b0a80903b
commit 5295fc07d5
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -23,6 +23,7 @@ PHP NEWS
- Intl:
. Fix memleak on failure in collator_get_sort_key(). (nielsdos)
. Fix return value on failure for resourcebundle count handler. (Girgias)
- LDAP:
. Fixed bug GH-18529 (additional inheriting of TLS int options).

2
ext/intl/resourcebundle/resourcebundle_class.c
View File

@@ -308,7 +308,7 @@ static zend_result resourcebundle_array_count(zend_object *object, zend_long *co
if (rb->me == NULL) {
intl_errors_set(&rb->error, U_ILLEGAL_ARGUMENT_ERROR,
"Found unconstructed ResourceBundle", 0);
return 0;
return FAILURE;
}
*count = ures_getSize( rb->me );