-
Notifications
You must be signed in to change notification settings - Fork 1.8k
check snappy block length before crc trailer in decode_snappy #3807
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
dxbjavid
wants to merge
4
commits into
apache:main
Choose a base branch
from
dxbjavid:snappy-block-len-check
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+93
−0
Open
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
efd1ebc
check snappy block length before crc trailer in decode_snappy
afda797
add test for undersized snappy blocks and fix guard indentation
dxbjavid e8386ac
Fix formatting of error handling in codec.c
martin-g 844692b
reject snappy block length above SIZE_MAX before decode
dxbjavid File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -142,6 +142,11 @@ static int decode_snappy(avro_codec_t c, void * data, int64_t len) | |
| uint32_t crc; | ||
| size_t outlen; | ||
|
|
||
| if (len < 4) { | ||
| avro_set_error("Snappy block is too small to contain a CRC32 checksum"); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The indentation is off.
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. good catch, fixed. the block now uses the same spacing as the rest of the function. |
||
| return 1; | ||
| } | ||
|
|
||
| if (snappy_uncompressed_length((const char*)data, len-4, &outlen) != SNAPPY_OK) { | ||
| avro_set_error("Uncompressed length error in snappy"); | ||
| return 1; | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lenshould also be smaller than SIZE_MAX otherwise on 32-bit systems it may overflow when passed tosnappy_uncompressed_length()that accepts size_t.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good point, that 32-bit overflow would slip straight through. added the SIZE_MAX bound to the same guard and pushed. builds fine here with the snappy codec on and the test still passes.