Conversation
…ansformation. Fix php#23730 Importing a stylesheet from a php:function callback freed the stylesheet libxslt was still applying, and the transformation methods kept using the stale pointer to save the result. The transformation depth is now tracked on the object and importStylesheet() throws while it is non-zero. Close phpGH-23737
… callback. Fix php#23747 ZipArchive::close() called from a progress or cancel callback ran a nested zip_close() that failed, then zip_discard() freed the archive while the outer zip_close() from close() or open() was still using it. Track the close in progress and throw an Error from close() and open() meanwhile. Close phpGH-23749
…luation Reconstructing the object from a php:function callback freed the context libxml2 was still evaluating, and php_xpath_eval() wrote back into it once the evaluation returned. The evaluation depth is now tracked on the object and __construct() throws while it is non-zero. Close phpGH-23735
… during request activation) Closes phpGH-22568
The prompt parser ran as a do-while, so an empty cli.prompt executed the body on the terminator and scanned past it. Use a while loop and smart_str_extract(), which returns the interned empty string when nothing was appended. No regression test: extra unicode warnings from the over-read depend on heap contents, so a .phpt cannot pin the bug red-before. Closes phpGH-23415
init_process_info() memset the pointer parameter instead of the PROCESS_INFORMATION structure it points at, leaving the struct uninitialized before CreateProcessW(). Zero it through the pointer. find_comspec_nt() dereferences *comspec in its cleanup while the caller only assigns it on success, so a failed SearchPathW() read an indeterminate value. Initialize the caller's variable to NULL. set_proc_descriptor_to_blackhole() tested CreateFileA() against NULL, but CreateFileA() signals failure with INVALID_HANDLE_VALUE, so a failed open went undetected and an invalid handle was inherited by the child. Test against INVALID_HANDLE_VALUE. Closes phpGH-23412
…tructions with callable conversion Call level counter was broken: ZEND_CALLABLE_CONVERT was forgotten. Closes phpGH-23777.
The x86 matcher folds v = BINOP(a, b); c = CMP(v, 0); GUARD(c) into IR_GUARD_JCC_INT, emitting the BINOP, dropping the CMP and branching on the flags the BINOP left, but it only required the BINOP to precede the CMP in the IR. Once GCM hoists a loop-invariant BINOP into a dominating block, the jcc reads flags the intervening code has clobbered and the guard fires on whatever is in EFLAGS. Require the BINOP to sit in the guard's block and allow only snapshots between the comparison and the guard, the way ir_match_fuse_load() pairs ir_in_same_block() with ir_match_has_mem_deps(). The sibling MEM_BINOP fold already checks the block, the IF side folds are pinned by full ref adjacency, and ir_aarch64.dasc has no guard fold. Mirrors the upstream fix dstogov/ir@51107a3. Fixes phpGH-23693 Closes phpGH-23711
php_session_regenerate_id() opened the handler with s_open() and then threw when s_create_sid() returned no id, leaving mod_data open until request shutdown and double-opening it on the next session start. The collision-retry failure path in the same function already closes the handler; do the same on the null-id path.
iliaal
force-pushed
the
fix/session-regen-id-close-handler-84
branch
from
September 20, 2026 16:11
86c761e to
14b740f
Compare
Owner
Author
|
Promoted upstream as php#23800. |
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 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.
php_session_regenerate_id() opened the save handler via s_open() and then threw when s_create_sid() failed, leaving mod_data open until request shutdown and double-opening it on the next session start; the collision-retry loop in the same function already closes the handler on its failure. This closes it on the null-id path too. Split out of staging PR 286 so each PR carries a single fix.