[pull] master from php:master#847
Merged
Merged
Conversation
ps_call_handler() returned on the recursive-call rejection branch before reaching the argv cleanup loop, leaking one ref per owned argument. The read/write/destroy/validate_sid/update_timestamp callers copy the session id and data into argv and rely on ps_call_handler() to release them, so a handler that re-enters session machinery (for example calling session_destroy() from within a write handler) leaks those strings. Fold the handler call into an else branch so the cleanup loop always runs. Closes GH-22382
* PHP-8.4: Fix session save-handler argv leak on recursive rejection
* PHP-8.5: Fix session save-handler argv leak on recursive rejection
Use a shared helper for checking whether a path refers to the magic .phar directory. Treat .phar itself and paths below it as magic, while allowing non-magic entries that merely use a .phar-prefixed name such as .pharx. Apply the same check across creation, copying, ArrayAccess, stream lookup, directory iteration, extraction, and mounts so these paths are handled consistently. Co-authored-by: Gina Peter Banyard <girgias@php.net> Closes #22372
* PHP-8.4: ext/phar: Fix .phar-prefixed non-magic directory handling (#22372)
* PHP-8.5: ext/phar: Fix .phar-prefixed non-magic directory handling (#22372)
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.
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 : )