Repository navigation
Validate 7z next header bounds before allocation - #1430
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The overflow-safe validation is correctly applied before allocation and is comprehensively tested across sync and async paths.
0 open findings
What changed in this PR
Adds pre-allocation bounds validation for 7z next headers, preventing truncated archives from triggering excessive allocations.
Changes:
- Validates next-header ranges in synchronous and asynchronous readers.
- Adds boundary and truncation tests for both paths.
| File | Description |
|---|---|
ArchiveReader.cs |
Adds synchronous bounds validation. |
ArchiveReader.Async.cs |
Adds equivalent asynchronous validation. |
SevenZipHeaderValidationTests.cs |
Tests truncated and exact-boundary headers. |
🧠 Review effort: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
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.
This pull request adds robust validation to prevent reading past the end of a 7z archive when parsing the next header, addressing a potential security and reliability issue. It also introduces comprehensive unit tests to verify both sync and async code paths for these edge cases.
Header validation improvements:
ArchiveReader.ReadDatabaseandArchiveReader.ReadDatabaseAsyncto ensure the next header does not extend beyond the end of the stream, throwing anIncompleteArchiveExceptionif the check fails. This prevents potential out-of-bounds memory allocation and improves archive integrity validation. [1] [2]Test coverage:
SevenZipHeaderValidationTeststo verify that truncated or invalid next headers are detected early, and that valid edge cases are handled correctly, in both synchronous and asynchronous scenarios.