@@ -257,6 +257,10 @@ static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zv
257257 zend_class_entry * ce ;
258258 zval retval , child ;
259259 zend_object_iterator * sub_iter ;
260+ zend_object * sub_object ;
261+ uint32_t prev_level ;
262+ zend_result valid_result ;
263+ bool reentered ;
260264
261265 SPL_FETCH_SUB_ITERATOR (iterator , object );
262266
@@ -276,7 +280,17 @@ static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zv
276280 iterator = object -> iterators [object -> level ].iterator ;
277281 ZEND_FALLTHROUGH ;
278282 case RS_START :
279- if (iterator -> funcs -> valid (iterator ) == FAILURE ) {
283+ sub_object = Z_OBJ (object -> iterators [object -> level ].zobject );
284+ prev_level = object -> level ;
285+ GC_ADDREF (sub_object );
286+ valid_result = iterator -> funcs -> valid (iterator );
287+ reentered = object -> level != prev_level
288+ || object -> iterators [object -> level ].iterator != iterator ;
289+ OBJ_RELEASE (sub_object );
290+ if (reentered ) {
291+ return ;
292+ }
293+ if (valid_result == FAILURE ) {
280294 break ;
281295 }
282296 object -> iterators [object -> level ].state = RS_TEST ;
@@ -424,7 +438,7 @@ static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zv
424438 }
425439 }
426440 }
427- if (object -> level > 0 ) {
441+ if (object -> level > 0 && object -> iterators [ object -> level ]. iterator == iterator ) {
428442 zval garbage ;
429443 ZVAL_COPY_VALUE (& garbage , & object -> iterators [object -> level ].zobject );
430444 ZVAL_UNDEF (& object -> iterators [object -> level ].zobject );
0 commit comments