Fix GH-11591: AppendIterator fails to iterate with an empty generator #17316
+35
−9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Girgias
reviewed
Jan 2, 2025
Comment on lines
+108
to
+115
| static inline void zend_generator_ensure_initialized(zend_generator *generator) /* {{{ */ | ||
| { | ||
| if (UNEXPECTED(Z_TYPE(generator->value) == IS_UNDEF) && EXPECTED(generator->execute_data) && EXPECTED(generator->node.parent == NULL)) { | ||
| zend_generator_resume(generator); | ||
| generator->flags |= ZEND_GENERATOR_AT_FIRST_YIELD; | ||
| } | ||
| } | ||
| /* }}} */ |
There was a problem hiding this comment.
I don't really like exposing this in a header.
I would rather prefer creating a new API (e.g. zend_generator_is_empty), but considering you are trying to fix a bug in SPL it seems far more likely that SPL is doing something incorrect in the iterator code.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Appending an empty generator is virtually a no-op, except that the generator gets consumed and is no longer available.
With this PR,
AppendIterator::apendterminates early if its argument is an empty generator.