Fix GH-16054: Segmentation fault when resizing hash table iterator list while adding #16060
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
… list while adding zend_array_dup_ht_iterators() loops over the hash table iterators and can call zend_hash_iterator_add(). zend_hash_iterator_add() can resize the array causing a crash in zend_array_dup_ht_iterators(). We solve this by refetching the iter pointer after an add happened.
nielsdos
commented
Sep 25, 2024
Zend/zend_hash.c
Outdated
|
|
||
| while (iter != end) { | ||
| if (iter->ht == source) { | ||
| size_t iter_index = iter - EG(ht_iterators); |
There was a problem hiding this comment.
Alternative idea is to use indices in the while loop, but then we have to fetch EG(ht_iterators) always in the loop body which seemed more expensive.
There was a problem hiding this comment.
I think indices are going to be better.
There was a problem hiding this comment.
Ok I have pushed a commit to do that.
dstogov
approved these changes
Sep 25, 2024
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.
zend_array_dup_ht_iterators() loops over the hash table iterators and can call zend_hash_iterator_add(). zend_hash_iterator_add() can resize the array causing a crash in zend_array_dup_ht_iterators().
We solve this by refetching the iter pointer after an add happened.