Validate PKWARE compressed size before header subtraction#520
Open
rootvector2 wants to merge 1 commit intonih-at:mainfrom
Open
Validate PKWARE compressed size before header subtraction#520rootvector2 wants to merge 1 commit intonih-at:mainfrom
rootvector2 wants to merge 1 commit intonih-at:mainfrom
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
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.
PKWARE encrypted entries include a 12-byte encryption header that is
accounted for by subtracting
ZIP_CRYPTO_PKWARE_HEADERLENfromst->comp_sizein theZIP_SOURCE_STAThandler.If a malformed archive reports a compressed size smaller than the
PKWARE header length, the subtraction may wrap because
comp_sizeis an unsigned integer.
This patch adds validation during source creation to ensure that the
compressed size is present and large enough to contain the PKWARE
header. A guard is also added in the STAT handler as a defense-in-depth
measure.
The change mirrors the validation pattern already used in
zip_source_winzip_aes_decode.c.