[pull] master from php:master#939
Merged
Merged
Conversation
…standard library macros: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] Closes GH-22031
* PHP-8.4: Fix compiler warning with glibc 2.43 support of C23 const-preserving standard library macros: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
* PHP-8.5: Fix compiler warning with glibc 2.43 support of C23 const-preserving standard library macros: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
This fixes CVE-2026-44927 and CVE-2026-44928.
* PHP-8.5: uri: Update to uriparser-1.0.2 (#22070)
In the tailcall VM, helpers which have extra args return the next opline instead of tailcalling it, relying on the parent to call it in ZEND_VM_DISPATCH_TO_HELPER(). When an interrupt is handled in the helper the opline may be tagged with ZEND_VM_ENTER_BIT, but ZEND_VM_DISPATCH_TO_HELPER() assumes an untagged opline. This PR changes ZEND_VM_INTERRUPT() so that such helpers return an opline whose handler is zend_interrupt_helper, instead of executing it directly. Closes GH-21922 Co-Authored-By: Arnaud Le Blanc <arnaud.lb@gmail.com>
* PHP-8.5: Fix tailcall helper dispatch after VM interrupt
* PHP-8.4: Fix GH-18422: int overflow in php_date_llabs
* PHP-8.5: Fix GH-18422: int overflow in php_date_llabs
…ng next node. Pin the new traverse target via SPL_LLIST_CHECK_ADDREF before the shift/pop destructor runs. Otherwise a destructor that unlinks the next node (e.g. offsetUnset) frees it, leaving the iterator with a dangling pointer. close GH-22066
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.
6 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 : )