[pull] master from php:master #435
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
We should compare the block memory, not the block metadata (See zend_mm_add_huge_block). This caused random test failure for ext/ffi/tests/gh14626.phpt when the malloc() performed by the FFI code lies close to the block metadata, and the size of the block is large enough. This was reported by #16902 (comment) Closes GH-16938.
* PHP-8.2: Fix is_zend_ptr() huge block comparison
* PHP-8.3: Fix is_zend_ptr() huge block comparison
* PHP-8.4: Fix is_zend_ptr() huge block comparison
We intend to execute `MATCH_ERROR` in the VM and return to trace a hot function in BB1. We generate a tail handler and skip all remaining oplines of BB0. That means the `INIT_FCALL` in BB0 is missed and `call_level` is not increased to 1. This leads to the assertion failure. This patch fixes the issue by updating the `call_level` for the skipped oplines. Closes GH-16939.
* PHP-8.4: Fix GH-16879: JIT dead code skipping does not update call_level
* PHP-8.2: Fix various memory leaks in curl mime handling
* PHP-8.3: Fix various memory leaks in curl mime handling
* PHP-8.4: Fix various memory leaks in curl mime handling
These are repeated a couple of times, so centralise it in 2 functions to reduce repetition and make updating this less error-prone.
* PHP-8.4: Extract call_level conditions out to separate functions (#16949)
Alpine CI regularly fails because of the sorting order of these tests. See #14962 (comment) Closes GH-16950.
* PHP-8.2: Backport GH-14962 to stable versions
* PHP-8.3: Backport GH-14962 to stable versions
* PHP-8.4: Backport GH-14962 to stable versions
It crashes because it's gonna try accessing the breakpoint which was cleared by user code in `phpdbg_clear();`. Not all breakpoint data was properly cleaned. Closes GH-16953.
* PHP-8.2: Fix GH-15208: Segfault with breakpoint map and phpdbg_clear()
* PHP-8.3: Fix GH-15208: Segfault with breakpoint map and phpdbg_clear()
* PHP-8.4: Fix GH-15208: Segfault with breakpoint map and phpdbg_clear()
…when running phpseclib tests (#16951)
* PHP-8.4: Fix the 1st parameter type casing of pg_set_chunked_rows_size()
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.1)
Can you help keep this open source service alive? 💖 Please sponsor : )