[pull] master from php:master#1039
Merged
Merged
Conversation
Use uenum_count() to pre-size arrays built from ICU enumerations. This avoids unnecessary HashTable growth in transliterator_list_ids(), resourcebundle_locales() and locale_get_keywords(). locale_get_keywords() also uses the keyword length reported by ICU when inserting the associative entry, with a fallback to strlen() for unknown lengths. If counting fails, the previous behavior is preserved by falling back to an unsized array initialization.
move_forward_ex() caches the active sub-iterator, then calls the inner iterator's move_forward(), which can re-enter userland. A next() that rewinds or advances the RecursiveIteratorIterator frees that sub-iterator, and the following validity check then reads freed memory. Re-fetch the sub-iterator after the call, the same way the no-more-elements branch already re-checks the level after endChildren(). Closes GH-22466
* PHP-8.4: Fix use-after-free in RecursiveIteratorIterator on reentry
* PHP-8.5: Fix use-after-free in RecursiveIteratorIterator on reentry
A php:function() callback receives DOM node arguments as proxies that own the underlying libxml node. If the callback detaches such a node, the argument cleanup frees it while libxml is still evaluating the expression and still references it in the result node-set. Keep node and node-set argument proxies alive until evaluation ends, as returned nodes already are. Closes GH-22468
* PHP-8.4: Fix use-after-free in XPath php:function argument nodes
* PHP-8.5: Fix use-after-free in XPath php:function argument nodes
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )