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

[#1797] Throw IllegalArgumentException if AbstractByteBuf.skipBytes(...) is used with a negative value

Browse Source
This commit is contained in:
Norman Maurer 2013-08-29 11:14:36 +02:00
parent 5447fe1e59
commit aed8c15326
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buffer/src/main/java/io/netty/buffer/AbstractByteBuf.java
View File

@ -729,6 +729,8 @@ public abstract class AbstractByteBuf extends ByteBuf {
@Override @Override
public ByteBuf skipBytes(int length) { public ByteBuf skipBytes(int length) {
checkReadableBytes(length);
int newReaderIndex = readerIndex + length; int newReaderIndex = readerIndex + length;
if (newReaderIndex > writerIndex) { if (newReaderIndex > writerIndex) {
throw new IndexOutOfBoundsException(String.format( throw new IndexOutOfBoundsException(String.format(
@ -1155,6 +1157,9 @@ public abstract class AbstractByteBuf extends ByteBuf {
*/ */
protected final void checkReadableBytes(int minimumReadableBytes) { protected final void checkReadableBytes(int minimumReadableBytes) {
ensureAccessible(); ensureAccessible();
if (minimumReadableBytes < 0) {
throw new IllegalArgumentException("minimumReadableBytes: " + minimumReadableBytes + " (expected: >= 0)");
}
if (readerIndex > writerIndex - minimumReadableBytes) { if (readerIndex > writerIndex - minimumReadableBytes) {
throw new IndexOutOfBoundsException(String.format( throw new IndexOutOfBoundsException(String.format(
"readerIndex(%d) + length(%d) exceeds writerIndex(%d): %s", "readerIndex(%d) + length(%d) exceeds writerIndex(%d): %s",

6
buffer/src/test/java/io/netty/buffer/UnpooledTest.java
View File

@ -586,4 +586,10 @@ public class UnpooledTest {
} }
wrapped.release(); wrapped.release();
} }
@Test(expected = IllegalArgumentException.class)
public void skipBytesNegativeLength() {
ByteBuf buf = freeLater(buffer(8));
buf.skipBytes(-1);
}
} }