[pull] master from php:master #1109
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=80&v=4){kind=small}
This is already handled by the switch below.
We can make a variant of the macro to control the throwing behaviour.
It was possible to make the heap accept unserialize data when the heap was corrupted or under modification. This adds the necessary check to prevent that from happening. Also, the exception check at the bottom is pointless, spl_heap_unserialize_internal_state() already returns FAILURE on exception. If it *is* necessary, it should be documented why. Closes GH-20109.
* PHP-8.5: Improve __unserialize() hardening for SplHeap/SplPriorityQueue
To do this, we move the macro check and therefore we also have to move some variable declarations to avoid compiler warnings. Closes GH-20130.
* PHP-8.3: Fix arginfo/zpp violations when LIBXML_SCHEMAS_ENABLED is not available
* PHP-8.4: Fix arginfo/zpp violations when LIBXML_SCHEMAS_ENABLED is not available
* PHP-8.5: Fix arginfo/zpp violations when LIBXML_SCHEMAS_ENABLED is not available
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
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 : )