Repository navigation
fix(java): advance readerIndex in continueReadBinarySize - #4133
Merged
Merged
Conversation
The 3/4-byte varint length-prefix fast path of readBinarySize() delegates to continueReadBinarySize(), which decoded the size but never assigned readerIndex, unlike the <=2-byte path. readBytesAndSize() (and readStringAndSize / *WithSize primitive readers) then copied the body from the stale index, i.e. starting at the first prefix byte: payloads with big enough length came back shifted by the prefix width, silently corrupted, or failed downstream with "reserved header bitmap flags" errors. Fix both the base and the java25 MemoryBuffer by assigning readerIndex = readIdx in continueReadBinarySize, matching continueReadVarUInt32. Add a regression test covering 3-byte and 4-byte prefixes plus a trailing read to verify index alignment. The Android path (MemoryOps.readBinarySize -> readVarUInt32) already advances readerIndex correctly and needed no change.
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.
Why?
The 3/4-byte varint length-prefix fast path of readBinarySize() delegates to continueReadBinarySize(), which decoded the size but never assigned readerIndex, unlike the <=2-byte path. readBytesAndSize() (and readStringAndSize / *WithSize primitive readers) then copied the body from the stale index, i.e. starting at the first prefix byte: payloads with big enough length came back shifted by the prefix width, silently corrupted, or failed downstream with "reserved header bitmap flags" errors.
What does this PR do?
Fix both the base and the java25 MemoryBuffer by assigning readerIndex = readIdx in continueReadBinarySize, matching continueReadVarUInt32. Add a regression test covering 3-byte and 4-byte prefixes plus a trailing read to verify index alignment.
The Android path (MemoryOps.readBinarySize -> readVarUInt32) already advances readerIndex correctly and needed no change.
Related issues
No related issue found