[pull] master from php:master #624
Merged
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
…ument::C14N() C14N code expects namespace to be in-tree, but we store namespaces in a different way out-of-tree to avoid reconciliations that break the tree structure in a way unexpected by the DOM spec. In the DOM spec, namespace nodes don't exist; they're regular attributes. To solve this, we temporarily make fake namespace nodes that we later remove. Closes GH-20457.
* PHP-8.4: Fix GH-20444: Dom\XMLDocument::C14N() seems broken compared to DOMDocument::C14N()
* PHP-8.5: Fix GH-20444: Dom\XMLDocument::C14N() seems broken compared to DOMDocument::C14N()
If you can extend the file between the file size gathering (resulting in a buffer allocation), and reading / writing to the file you can trigger a TOC-TOU where you write out of bounds. To solve this, add extra bound checks and make sure that write actions always fail when going out of bounds. The easiest way to trigger this is via a pipe, which is used in the test, but it should be possible with a regular file and a quick race condition as well. Closes GH-20591.
* PHP-8.3: Fix GH-20582: Heap Buffer Overflow in iptcembed
* PHP-8.4: Fix GH-20582: Heap Buffer Overflow in iptcembed
* PHP-8.5: Fix GH-20582: Heap Buffer Overflow in iptcembed
Change return type to bool as it only ever returns two values
…ters This prevents some strlen() reconputations
It always returns 1 and thus a bunch of error handling code is useless
…eader computation Removes some error handling and work if it fails
This prevents some copying and is in preparation of other refactoring preventing strlen() recomputations
Input as zend_string Use smart_str to concatenate strings Change return type to bool
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 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 : )