Add bounds checking and validation for binary dictionary values#1083
Merged
Add bounds checking and validation for binary dictionary values#1083
Conversation
Add bounds checking for pValueBuffer advancement when parsing .ocd2 dictionary files. A crafted .ocd2 file with manipulated numValueBytes values could cause reads past the end of the heap-allocated valueBuffer. The fix validates that: - numValueBytes is non-zero - pValueBuffer + numValueBytes does not exceed the buffer end - The value is properly null-terminated within the buffer Fixes GHSA-q92m-gpfj-xgqv https://claude.ai/code/session_019sH5KXruubuLydo2NNasNE
Tests craft binary .ocd2 files to verify that NewFromFile properly rejects malformed input: - Value offset exceeding buffer bounds - Value not null-terminated within its claimed range - Zero-length numValueBytes - Cumulative offsets overflowing the buffer - Sanity check that well-formed crafted files still deserialize correctly https://claude.ai/code/session_019sH5KXruubuLydo2NNasNE
Owner
Author
|
@codex review |
|
Codex Review: Didn't find any major issues. 🚀 ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
3 tasks
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.
Summary
This change adds safety validation when reading serialized values from OpenCC binary dictionary files to prevent out-of-bounds memory access and ensure data integrity.
Key Changes
pValueBufferEndpointer to track the end boundary of the value buffernumValueBytesdoesn't exceed the remaining buffer spaceInvalidFormatexception with descriptive error messages when validation failsImplementation Details
The validation occurs before dereferencing the value pointer, ensuring:
This prevents potential buffer overflows and data corruption when reading malformed or corrupted dictionary files.