Skip to content

reject invalid message length in MessageSerializer.readMessage #1361

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
Support-itecz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

reject invalid message length in MessageSerializer.readMessage #1361

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
7 changes: 7 additions & 0 deletions vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,9 +708,16 @@ public static MessageMetadataResult readMessage(ReadChannel in) throws IOExcepti
// ARROW-6313, if the first 4 bytes are continuation message, read the next 4 for the length
if (in.readFully(buffer) == 4) {
messageLength = MessageSerializer.bytesToInt(buffer.array());
} else {
// Stream ended right after the continuation token, treat as end-of-stream.
return null;
}
}

if (messageLength < 0) {
throw new IOException("Invalid message length: " + messageLength);
}

// Length of 0 indicates end of stream
if (messageLength != 0) {

Expand Down
18 changes: 18 additions & 0 deletions vector/src/test/java/org/apache/arrow/vector/ipc/MessageSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

Expand Down Expand Up @@ -121,6 +122,23 @@ public void testWriteMessageBufferAligned() throws IOException {
assertEquals(0, result.getInt());
}

@Test
public void testReadMessageWithContinuationTokenThenEndOfStream() throws IOException {
// A continuation token (0xFFFFFFFF) with no length prefix following it.
byte[] bytes = new byte[] {(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF};
ReadChannel in = new ReadChannel(Channels.newChannel(new ByteArrayInputStream(bytes)));
assertNull(MessageSerializer.readMessage(in));
}

@Test
public void testReadMessageRejectsNegativeLength() {
// Little-endian prefix encoding a negative message length (-5), which is not the
// continuation token.
byte[] bytes = new byte[] {(byte) 0xFB, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF};
ReadChannel in = new ReadChannel(Channels.newChannel(new ByteArrayInputStream(bytes)));
assertThrows(IOException.class, () -> MessageSerializer.readMessage(in));
}

@Test
public void testSchemaMessageSerialization() throws IOException {
Schema schema = testSchema();
Expand Down
Loading