Repository navigation
end the zlib stream when readDataBlock and sync throw - #4035
Open
ArjunD3456 wants to merge 1 commit into
Open
ArjunD3456 wants to merge 1 commit into
ArjunD3456 wants to merge 1 commit into
Conversation
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
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.
What is the purpose of the change
DataFileReaderBase::readDataBlocksets up az_streamwithinflateInit2for every deflate-coded block it reads and only reaches the matchinginflateEndonce the inflate loop has run to completion. When a block does not inflate, thethrowinside that loop leaves the scope with the stream still live, so the ~7 KiB of state zlib allocated for it is lost. The payload comes straight from the file, so any corrupt or crafted container leaks it, and a process that keeps reading untrusted files and handlesavro::Exceptiongrows without bound.DataFileWriterBase::synchas the same shape arounddeflateInit2, and theresizecall in either loop can leave the scope the same way. Giving the stream a small scope guard puts theinflateEnd/deflateEndcall on every exit path, which is howZstdCompressWrapperandZstdDecompressWrapperalready release their contexts.Verifying this change
This change added tests and can be verified as follows:
testCorruptDeflateBlocktoDataFileTests, which writes a deflate file, rewrites the first payload byte so the block header carries the reserved RFC 1951BTYPE3, and checks the read is rejected rather than decoded;./build.sh testand./build.sh lintboth stay greenDocumentation