[pull] master from php:master#813
Merged
pull[bot] merged 7 commits intoturkdevops:masterfrom Mar 25, 2026
Merged
Conversation
The TAILLCALL VM returns in ZEND_VM_ENTER_EX and ZEND_VM_LEAVE, but that's not necessary. Redefine ZEND_VM_ENTER_EX, ZEND_VM_LEAVE so that they tailcall instead. This makes the Symfony and bench.php benchmarks about 1% and 3.5% faster. Closes GH-21475
We must not jump into a zend_try block because that skips setting up of EG(bailout), which will deref null when trying to bailout. In practice, this bug is impossible to trigger, given php_execute_script() already guards against bailout. Fixes GH-21420
This reverts commit e5a723e. This fix was wrong, because we don't want to run the second try block when the first block bails. Given this can't happen in practice, let's just keep it the way it is.
Cloning a non-document DOM node creates a copy within the same xmlDoc. importStylesheet then passes that original document to xsltParseStylesheetDoc, which may strip and free nodes during processing, invalidating PHP objects still referencing them. Resolve the ownerDocument for non-document nodes and clone that instead. close GH-21500
* PHP-8.4: Fix GH-21496: UAF in dom_objects_free_storage.
* PHP-8.5: Fix GH-21496: UAF in dom_objects_free_storage.
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 : )