[pull] master from php:master - #1197
Merged
Merged
Conversation
Clone built the fake namespace decl from original_node->parent, which xinclude has already freed; parent_intern is the durable handle. Closes GH-23248
* PHP-8.4: Fix DOMNameSpaceNode clone UAF after xinclude
* PHP-8.5: Fix DOMNameSpaceNode clone UAF after xinclude
dom_xpath_intern_for_doc walked xpath_callbacks.node_list with Z_DOMOBJ_P on every entry. That list also stores arrays (nodeset-mode callback arguments). Same-document results take the early return; a later php:function that returns a node from another document walks the leftover array first. Skip non-objects and recurse into arrays so the matching intern is found instead of type-confusing the array. Closes GH-23253
* PHP-8.5: Fix DOMXPath crash wrapping a foreign node after a nodeset callback
ubrk_previous() returns UBRK_DONE after the first boundary. The loop condition ran before that assignment, so the body treated -1 as an offset and wrote into the zend_string NUL. Break when the iterator is done, and NUL-terminate the result of zend_string_alloc.
…3284) AIX/PASE defaults to a powerpc-ibm-(aix|os400) triplet, even though the build may be 64-bit. This causes a problem with fibers, as the 32-bit assembly will be selected, causing a build failure. Detect this case and override the selected assembly ourselves. Tested on PASE, which with IBM's provided packages, defaults to a 64-bit build environment.
…3330) The package got mixed together some time.
* PHP-8.4: CI: fix flacky ext/mysqli/tests/protocol_stmt_row_fetch_data.phpt (#23330)
* PHP-8.5: CI: fix flacky ext/mysqli/tests/protocol_stmt_row_fetch_data.phpt (#23330)
The timezone-and-locale IntlGregorianCalendar constructor passes the TimeZone to an adopting ICU constructor. On failure, PHP deleted that zone again after the calendar destructor had already freed it. Closes #23321
* PHP-8.4: Fix IntlGregorianCalendar double-free of an adopted TimeZone (#23321)
* PHP-8.5: Fix IntlGregorianCalendar double-free of an adopted TimeZone (#23321)
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.
3 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 : )