Fix WinzipAesCryptoStream potentially not getting disposed#939
Merged
adamhathcock merged 2 commits intoadamhathcock:masterfrom Aug 22, 2025
Merged
Conversation
…ream a ReadOnlySubStream never disposes its passes in stream which is problematic when that stream needs to be disposed. It's hard to tell who exactly has ownership over which stream here, but I'll just assume that whatever stream is passed in here should be disposed.
Morilli
force-pushed
the
fix-winaescryptostream-dispose
branch
from
d57336c to
9f30696
Compare
adamhathcock
approved these changes
Aug 22, 2025
Owner
adamhathcock
left a comment
adamhathcock
left a comment
There was a problem hiding this comment.
Seems right. Must have been something before that needed this. Oh well. Thanks!
This was referenced Oct 13, 2025
This was referenced Oct 24, 2025
This was referenced Nov 3, 2025
This was referenced Nov 10, 2025
This was referenced Nov 24, 2025
This was referenced Dec 1, 2025
This was referenced Dec 15, 2025
This was referenced Dec 22, 2025
This was referenced Jan 5, 2026
This was referenced Jan 5, 2026
This was referenced Feb 13, 2026
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
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.
ZipFilePart.CreateDecompressionStreamwhen called withZipCompressionMethod.Nonewould wrap the passed in stream in aReadOnlySubstream(if it wasn't one already) and return that. In case of encrypted zip files, that stream was aWinzipAesCryptoStreamwhich needs to be disposed for it to finish reading the entry data, howeverReadOnlySubstreamnever disposes its underlying stream, causing failure when trying to read further.I've adjusted the logic to never wrap the passed in stream in a
ReadOnlySubstreamwhich seems to be fine with the existing logic and ensures the stream is always disposed if necessary. I'm not 100% this is the correct thing to do, but it's really hard to determine who has ownership over which stream and what component should be responsible for disposal, so hopefully unconditionally not wrapping the stream is fine here.I've added a test to make sure this won't regress in the future.