Skip to content

MINOR: Check source range in ArrowBuf.setBytes for direct ByteBuffers #1380

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

MINOR: Check source range in ArrowBuf.setBytes for direct ByteBuffers #1380

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
6 changes: 6 additions & 0 deletions memory/memory-core/src/main/java/org/apache/arrow/memory/ArrowBuf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,12 @@ public void setBytes(long index, ByteBuffer src) {
public void setBytes(long index, ByteBuffer src, int srcIndex, int length) {
// bound check for this ArrowBuf where the data will be copied into
checkIndex(index, length);
// bound check for src ByteBuffer
if (isOutOfBounds(srcIndex, length, src.capacity())) {
throw new IndexOutOfBoundsException(
String.format(
"index: %d, length: %d (expected: range(0, %d))", srcIndex, length, src.capacity()));
}
if (src.isDirect()) {
// copy length bytes of data from src ByteBuffer starting at address
// srcAddress into this ArrowBuf at address dstAddress
Expand Down
11 changes: 11 additions & 0 deletions memory/memory-core/src/test/java/org/apache/arrow/memory/TestArrowBuf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,17 @@ public void testSetBytesUnsliced() {
}
}

@Test
public void testSetBytesDirectOutOfBoundsSource_RaisesIndexOutOfBoundsException() {
ByteBuffer data = ByteBuffer.allocateDirect(8);
try (BufferAllocator allocator = new RootAllocator(128);
ArrowBuf buf = allocator.buffer(64)) {
assertThrows(IndexOutOfBoundsException.class, () -> buf.setBytes(0, data, 0, 64));
assertThrows(IndexOutOfBoundsException.class, () -> buf.setBytes(0, data, 4, 8));
assertThrows(IndexOutOfBoundsException.class, () -> buf.setBytes(0, data, -1, 4));
}
}

/** ARROW-9221: guard against big-endian byte buffers. */
@Test
public void testSetBytesBigEndian() {
Expand Down
Loading