Fix session save-handler argv leak on recursive rejection#22382
Open
iliaal wants to merge 1 commit into
Open
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.
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
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.
ps_call_handler() returned on the recursive-call rejection branch before the argv cleanup loop, leaking one ref per owned argument. The read/write/destroy callers copy the session id and data into argv and rely on the function to release them, so a handler that re-enters session machinery (for example calling session_destroy() from within a write handler) leaks those strings. Folding the call into an else branch runs the cleanup unconditionally. Confirmed under USE_ZEND_ALLOC=0 valgrind: 64 bytes definitely lost, gone after the fix.