A wss dial that fails after the handshake frees its TLS state - #111
Merged
Merged
Conversation
The TLS state and its two 64 KiB buffers were freed only by errdefers inside the block that allocated them. Once that block had exited, a failed websocket upgrade, or a dial cancelled while waiting for it, left all three behind. An errdefer at the level of the dial now frees them on every later failure. Closes #110.
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.
Closes #110.
The TLS state and its two 64 KiB buffers were freed only by errdefers inside the
wssblock that allocated them. Once that block had exited andtransport.tls_statewas set, a failure at the websocket upgrade, or a cancel while waiting for it, left all three behind. An errdefer at the level of the dial now frees them on any later failure. The success path is unchanged:Transport.deinitstill owns them once the dial returns.Verified
dialopens a real TLS connection, which CI cannot reach, so this was driven by hand under a leak-checking allocator against a localopenssl s_server, with certificate checks disabled in a scratch build only:-www)HandshakeFailed, 3 leaks: theTlsStateand both buffersHandshakeFailed, no leak-quiet)HandshakeFailed, the same 3 leaksHandshakeFailed, no leakAll 210 tests pass.