Skip to content

reject negative 64-bit payload length in WebSocketFrameReader #854

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

Merged
arturobernalg merged 1 commit into from
Jul 21, 2026
+15 −0
Merged

reject negative 64-bit payload length in WebSocketFrameReader #854

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
3 changes: 3 additions & 0 deletions httpclient5-websocket/src/main/java/org/apache/hc/core5/websocket/WebSocketFrameReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ WebSocketFrame readFrame() throws IOException {
for (int i = 0; i < 8; i++) {
len = (len << 8) | (readByte() & 0xFF);
}
if (len < 0) {
throw new WebSocketException("Negative frame payload length");
}
}
if (len > Integer.MAX_VALUE) {
throw new WebSocketException("Frame payload too large: " + len);
Expand Down
12 changes: 12 additions & 0 deletions ...ient5-websocket/src/test/java/org/apache/hc/core5/websocket/WebSocketFrameReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,16 @@ void frame_too_large_throws() {
final ByteBuffer f = maskedFrame(0x82, new byte[len]);
assertThrows(WebSocketException.class, () -> readFrame(f, 1024));
}

@Test
void negative_extended_length_is_rejected() {
final ByteBuffer f = ByteBuffer.allocate(2 + 8 + 4 + 5);
f.put((byte) 0x81); // FIN|TEXT
f.put((byte) (0x80 | 127)); // MASK, 64-bit length
f.putLong(0xFFFFFFFF00000000L); // MSB set: not a valid payload length
f.put(MASK_KEY);
f.put(new byte[5]);
f.flip();
assertThrows(WebSocketException.class, () -> readFrame(f, 8192));
}
}
Loading