archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Fix GH-18309: ipv6 filter integer overflow
  Fix GH-18304: Changing the properties of a DateInterval through dynamic properties triggers a SegFault
This commit is contained in:
Niels Dossche 2025-04-11 23:36:12 +02:00
commit a019fbd970
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
16 changed files with 135 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/zip/php_zip.c
View file

@ -889,8 +889,6 @@ static zval *php_zip_get_property_ptr_ptr(zend_object *object, zend_string *name
zval *retval = NULL;
zip_prop_handler *hnd = NULL;
cache_slot[0] = cache_slot[1] = cache_slot[2] = NULL;
obj = php_zip_fetch_object(object);
if (obj->prop_handler != NULL) {
@ -899,6 +897,8 @@ static zval *php_zip_get_property_ptr_ptr(zend_object *object, zend_string *name
if (hnd == NULL) {
retval = zend_std_get_property_ptr_ptr(object, name, type, cache_slot);
} else if (cache_slot) {
cache_slot[0] = cache_slot[1] = cache_slot[2] = NULL;
}
return retval;