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

Expose inner dual_it iterator to GC

Browse Source 
Moving the zend_iterator_dtor from dual_it_dtor to dual_it_free_storage
exposed this GC leak in an existing test. Forward the result of the
iterator get_gc to the dual_it get_gc.
This commit is contained in:
Nikita Popov
2021-06-08 16:52:23 +02:00
parent 64865c6092
commit 15fafcd664
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ext/spl/spl_iterators.c
View File

@@ -2079,10 +2079,6 @@ static void spl_dual_it_dtor(zend_object *_object)
zend_objects_destroy_object(_object);
spl_dual_it_free(object);
if (object->inner.iterator) {
zend_iterator_dtor(object->inner.iterator);
}
}
/* }}} */
@@ -2091,6 +2087,9 @@ static void spl_dual_it_free_storage(zend_object *_object)
{
spl_dual_it_object *object = spl_dual_it_from_obj(_object);
if (object->inner.iterator) {
zend_iterator_dtor(object->inner.iterator);
}
if (!Z_ISUNDEF(object->inner.zobject)) {
zval_ptr_dtor(&object->inner.zobject);
@@ -2137,6 +2136,17 @@ static HashTable *spl_dual_it_get_gc(zend_object *obj, zval **table, int *n)
spl_dual_it_object *object = spl_dual_it_from_obj(obj);
zend_get_gc_buffer *gc_buffer = zend_get_gc_buffer_create();
if (object->inner.iterator && object->inner.iterator->funcs->get_gc) {
zval *inner_table;
int inner_n;
HashTable *inner_ht = object->inner.iterator->funcs->get_gc(
object->inner.iterator, &inner_table, &inner_n);
zend_get_gc_buffer_add_zvals(gc_buffer, inner_table, inner_n);
if (inner_ht) {
zend_get_gc_buffer_add_ht(gc_buffer, inner_ht);
}
}
if (!Z_ISUNDEF(object->inner.zobject)) {
zend_get_gc_buffer_add_zval(gc_buffer, &object->inner.zobject);
}