Skip to content

[SPARK-57426][CORE] Validate length before allocation in Encoders.Strings.decode #56488

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

Closed
dongjoon-hyun wants to merge 1 commit into from
Closed

[SPARK-57426][CORE] Validate length before allocation in Encoders.Strings.decode #56488

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: 2 additions & 0 deletions common/network-common/src/main/java/org/apache/spark/network/protocol/Encoders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.Objects;

import io.netty.buffer.ByteBuf;
import org.roaringbitmap.RoaringBitmap;
Expand All @@ -41,6 +42,7 @@ public static void encode(ByteBuf buf, String s) {

public static String decode(ByteBuf buf) {
int length = buf.readInt();
Objects.checkFromIndexSize(0, length, buf.readableBytes());
byte[] bytes = new byte[length];
buf.readBytes(bytes);
return new String(bytes, StandardCharsets.UTF_8);
Expand Down
22 changes: 22 additions & 0 deletions common/network-common/src/test/java/org/apache/spark/network/protocol/EncodersSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,28 @@ public void testRoaringBitmapEncodeShouldFailWhenBufferIsSmall() {
() -> Encoders.Bitmaps.encode(buf, bitmap));
}

@Test
public void testStringsEncodeDecode() {
String s = "spark";
ByteBuf buf = Unpooled.buffer(Encoders.Strings.encodedLength(s));
Encoders.Strings.encode(buf, s);
assertEquals(s, Encoders.Strings.decode(buf));
}

@Test
public void testStringsDecodeShouldFailWhenLengthIsNegative() {
ByteBuf buf = Unpooled.buffer();
buf.writeInt(-1);
assertThrows(IndexOutOfBoundsException.class, () -> Encoders.Strings.decode(buf));
}

@Test
public void testStringsDecodeShouldFailWhenLengthExceedsReadableBytes() {
ByteBuf buf = Unpooled.buffer();
buf.writeInt(Integer.MAX_VALUE);
assertThrows(IndexOutOfBoundsException.class, () -> Encoders.Strings.decode(buf));
}

@Test
public void testBitmapArraysEncodeDecode() {
RoaringBitmap[] bitmaps = new RoaringBitmap[] {
Expand Down