Fix iterator position resetting #13188
Closed
Conversation
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
Previously, when an array was converted from packed to hashed, iterators would not be correctly reset to 0. Similarly, removing the last element from an array would decrease nNumUsed but not actually fix the iterator position, causing the element to be skipped in the next iteration. Some code was also removed that skips over IS_UNDEF elements for nInternalPointer and iterator positions. This is unnecessary, as this already happens during iteration. Closes phpGH-13178
iluuu1994
commented
Jan 18, 2024
|
The changes to zend_hash.c are fine, but you need to add extra support to php_splice() directly as that function really splices into the middle of the target array by doing a copy of it. (Also: why does php_splice unconditionally do a copy instead of like ... just in case the replacement array is bigger than the $length arg? .. Right, because it resets numerical keys, for reasons.) |
|
@bwoebi php_slice is adjusted accordingly. Tbh the existing behavior is somewhat dubious though. I would expect the newly appended elements to be seen, not skipped. |
iluuu1994
added a commit
to iluuu1994/php-src
that referenced
this pull request
Jul 30, 2025
Since phpGH-13188 we're no longer immediately updating iterator positions when deleting array elements. zend_hash_rehash() needs to adapt accordingly by bumping nInternalPosition for IS_UNDEF elements. This is already the case for array iterators. Fixes phpGH-19280
iluuu1994
added a commit
to iluuu1994/php-src
that referenced
this pull request
Jul 30, 2025
Since phpGH-13188 we're no longer immediately updating iterator positions when deleting array elements. zend_hash_rehash() needs to adapt accordingly by bumping nInternalPosition for IS_UNDEF elements. This is already the case for array iterators. Fixes phpGH-19280
iluuu1994
added a commit
to iluuu1994/php-src
that referenced
this pull request
Jul 30, 2025
Since phpGH-13188 we're no longer immediately updating iterator positions when deleting array elements. zend_hash_rehash() needs to adapt accordingly by adjusting nInternalPosition for IS_UNDEF elements. This is already the case for array iterators. Fixes phpGH-19280
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.
Previously, when an array was converted from packed to hashed, iterators would not be correctly reset to 0. Similarly, removing the last element from an array would decrease nNumUsed but not actually fix the iterator position, causing the element to be skipped in the next iteration.
Some code was also removed that skips over IS_UNDEF elements for nInternalPointer and iterator positions. This is unnecessary, as this already happens during iteration.
Closes GH-13178