andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix IndexOutOfBoundsException for CompositeByteBuf #4679

Browse Source 
Motivation:

Modifications:

Use the correct start index

Result:

Fixes #4679
This commit is contained in:
Xiaoyan Lin 2016-01-08 15:52:15 -08:00 committed by Scott Mitchell
parent 301c40adbd
commit 6f8618889a
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buffer/src/main/java/io/netty/buffer/ByteBufUtil.java
View File

@ -525,7 +525,7 @@ public final class ByteBufUtil {
try { try {
buffer.writeBytes(src, readerIndex, len); buffer.writeBytes(src, readerIndex, len);
// Use internalNioBuffer(...) to reduce object creation. // Use internalNioBuffer(...) to reduce object creation.
decodeString(decoder, buffer.internalNioBuffer(readerIndex, len), dst); decodeString(decoder, buffer.internalNioBuffer(0, len), dst);
} finally { } finally {
// Release the temporary buffer again. // Release the temporary buffer again.
buffer.release(); buffer.release();

13
buffer/src/test/java/io/netty/buffer/ByteBufUtilTest.java
View File

@ -106,4 +106,17 @@ public class ByteBufUtilTest {
Assert.assertEquals(text, ByteBufUtil.decodeString(buffer, 0, buffer.readableBytes(), charset)); Assert.assertEquals(text, ByteBufUtil.decodeString(buffer, 0, buffer.readableBytes(), charset));
buffer.release(); buffer.release();
} }
@Test
public void testToStringDoesNotThrowIndexOutOfBounds() {
CompositeByteBuf buffer = Unpooled.compositeBuffer();
try {
byte[] bytes = "1234".getBytes(CharsetUtil.UTF_8);
buffer.addComponent(Unpooled.buffer(bytes.length).writeBytes(bytes));
buffer.addComponent(Unpooled.buffer(bytes.length).writeBytes(bytes));
Assert.assertEquals("1234", buffer.toString(bytes.length, bytes.length, CharsetUtil.UTF_8));
} finally {
buffer.release();
}
}
} }