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:
  Handle GC cycles properly in intl iterators
This commit is contained in:
Niels Dossche 2025-01-04 17:49:39 +01:00
commit 3240f478bc
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
4 changed files with 61 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/intl/breakiterator/breakiterator_iterators.cpp
View file

@ -144,7 +144,6 @@ typedef struct zoi_break_iter_parts {
static void _breakiterator_parts_destroy_it(zend_object_iterator *iter)
{
zval_ptr_dtor(&iter->data);
efree(iter);
}
static void _breakiterator_parts_get_current_key(zend_object_iterator *iter, zval *key)
@ -223,7 +222,7 @@ static const zend_object_iterator_funcs breakiterator_parts_it_funcs = {
_breakiterator_parts_move_forward,
_breakiterator_parts_rewind,
zoi_with_current_invalidate_current,
NULL, /* get_gc */
zoi_with_current_get_gc,
};
void IntlIterator_from_BreakIterator_parts(zval *break_iter_zv,