From c9ffae1bec67d628d2859368be66175b5c693de5 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 18 Feb 2019 13:46:24 +0100 Subject: Fixed bug #77633 Add a new class flag to inherit get_iterator() when implementing the Iterator/IteratorAggregate interfaces and use it for ArrayIterator. --- Zend/zend_interfaces.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'Zend/zend_interfaces.c') diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index e5b6251d17..fe4c9ed9a3 100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -340,7 +340,13 @@ static int zend_implement_aggregate(zend_class_entry *interface, zend_class_entr } } } - class_type->get_iterator = zend_user_it_get_new_iterator; + if (class_type->parent + && (class_type->parent->ce_flags & ZEND_ACC_REUSE_GET_ITERATOR)) { + class_type->get_iterator = class_type->parent->get_iterator; + class_type->ce_flags |= ZEND_ACC_REUSE_GET_ITERATOR; + } else { + class_type->get_iterator = zend_user_it_get_new_iterator; + } funcs_ptr = class_type->iterator_funcs_ptr; if (class_type->type == ZEND_INTERNAL_CLASS) { if (!funcs_ptr) { @@ -381,7 +387,13 @@ static int zend_implement_iterator(zend_class_entry *interface, zend_class_entry return FAILURE; } } - class_type->get_iterator = zend_user_it_get_iterator; + if (class_type->parent + && (class_type->parent->ce_flags & ZEND_ACC_REUSE_GET_ITERATOR)) { + class_type->get_iterator = class_type->parent->get_iterator; + class_type->ce_flags |= ZEND_ACC_REUSE_GET_ITERATOR; + } else { + class_type->get_iterator = zend_user_it_get_iterator; + } funcs_ptr = class_type->iterator_funcs_ptr; if (class_type->type == ZEND_INTERNAL_CLASS) { if (!funcs_ptr) { -- cgit v1.2.1