Skip to content

enforce stringLengthLimit in TCompactProtocol.readBinary #3605

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.

Sign up for GitHub

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 1 commit into
base: master
Choose a base branch
from
+15 −1
Open

enforce stringLengthLimit in TCompactProtocol.readBinary #3605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/java/src/main/java/org/apache/thrift/protocol/TCompactProtocol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ public ByteBuffer readBinary() throws TException {
if (length == 0) {
return EMPTY_BUFFER;
}
getTransport().checkReadBytesAvailable(length);
checkStringReadLength(length);
if (trans_.getBytesRemainingInBuffer() >= length) {
ByteBuffer bb = ByteBuffer.wrap(trans_.getBuffer(), trans_.getBufferPosition(), length);
trans_.consumeBuffer(length);
Expand Down
14 changes: 14 additions & 0 deletions lib/java/src/test/java/org/apache/thrift/protocol/TestMessageSizeLimits.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,20 @@ public void testCompactProtocol_stringLengthLimitEnforcedInFastPath() throws Exc
"TCompactProtocol stringLengthLimit must reject oversized strings in fast path");
}

@Test
public void testCompactProtocol_stringLengthLimitEnforcedForBinary() throws Exception {
// binary uses the same varint-length encoding as a string on the wire
byte[] buf = encodeCompactString(repeat('A', 100));
TMemoryInputTransport transport = new TMemoryInputTransport(buf);

TCompactProtocol proto = new TCompactProtocol(transport, 10L, -1L);

assertThrows(
TProtocolException.class,
proto::readBinary,
"TCompactProtocol stringLengthLimit must also gate readBinary, not just readString");
}

@Test
public void testConsumeBuffer_decrementsRemainingMessageSize() throws Exception {
// 20-byte transport; updateKnownMessageSize sets remainingMessageSize = 20
Expand Down
Loading