Repository navigation
Conversation
Contributor
Author
|
The LINUX_X32_DEBUG_ZTS Tracing JIT failure also happens on PHP-8.4 itself (runs 43196288502 and 43186660061), so it isn't caused by this change. |
Girgias
requested changes
Nov 13, 2026
Comment on lines
+2723
to
+2726
| SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); | ||
| if (!intern->inner.iterator) { | ||
| RETURN_NULL(); | ||
| } |
Member
There was a problem hiding this comment.
This very much feels that this check should be in SPL_FETCH_AND_CHECK_DUAL_IT and not ad hoc.
Contributor
Author
There was a problem hiding this comment.
Moved it into SPL_FETCH_AND_CHECK_DUAL_IT in e1cc0c7 and dropped the ad hoc checks. AppendIterator is exempt since its inner iterator is legitimately NULL until the first append.
This file contains hidden or 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
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.
When a closed generator is passed to
parent::__construct()of a dual iterator, the constructor throws after the object is already marked as constructed, soinner.iteratorstays NULL. If the subclass catches the exception,spl_dual_it_next()only checked for a NULL inner iterator whendo_freewas 0, sonext()onFilterIterator,IteratorIterator,LimitIteratorand friends dereferenced it.NoRewindIteratorhad the same problem invalid(),key(),current()andnext().The NULL check in
spl_dual_it_next()now runs in both cases, and theNoRewindIteratormethods behave like the other iterators here:valid()returns false,key()andcurrent()return NULL, andnext()throws the existing "inner constructor wasn't initialized" error.Fixes #25415