archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  ext/intl: Fix return value on failure for resourcebundle count handler
This commit is contained in:
Gina Peter Banyard 2025-07-28 15:36:20 +01:00
commit b30ccf9158
No known key found for this signature in database
GPG key ID: F30F8C1ACF51943F
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -15,6 +15,10 @@ PHP NEWS
- GD: - GD:
. Fix incorrect comparison with result of php_stream_can_cast(). (Girgias) . Fix incorrect comparison with result of php_stream_can_cast(). (Girgias)
- Intl:
. Fix return value on failure for resourcebundle count handler. (Girgias)
- OPcache: - OPcache:
. Disallow changing opcache.memory_consumption when SHM is already set up. . Disallow changing opcache.memory_consumption when SHM is already set up.
(timwolla) (timwolla)

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) { if (rb->me == NULL) {
intl_errors_set(&rb->error, U_ILLEGAL_ARGUMENT_ERROR, intl_errors_set(&rb->error, U_ILLEGAL_ARGUMENT_ERROR,
"Found unconstructed ResourceBundle", 0); "Found unconstructed ResourceBundle", 0);
return 0; return FAILURE;
} }
*count = ures_getSize( rb->me ); *count = ures_getSize( rb->me );