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

[#529] ByteBuf.ensureWritableBytes() can trigger IllegalArgumentException

Browse Source 
- Remove redundant boundary check in ensureWritableBytes()
- Ensure calculateNewCapacity() never returns the value that exceeds
  maxCapacity
This commit is contained in:
Trustin Lee 2012-08-17 22:08:36 +09:00
parent aef7a14852
commit 505e767a09
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,27 +180,25 @@ public abstract class AbstractByteBuf implements ByteBuf {
return;
}
if (minWritableBytes > maxCapacity - writerIndex) {
if (minWritableBytes < 0) {
throw new IllegalArgumentException(String.format(
"minWritableBytes(%d) + writerIndex(%d) > maxCapacity(%d)",
minWritableBytes, writerIndex, maxCapacity));
"minWritableBytes: %d (expected: 0+)", minWritableBytes));
}
int minNewCapacity = writerIndex + minWritableBytes;
if (minNewCapacity > maxCapacity) {
if (minWritableBytes > maxCapacity - writerIndex) {
throw new IllegalArgumentException(String.format(
"minWritableBytes: %d (exceeds maxCapacity(%d))", minWritableBytes, maxCapacity));
}
// Normalize the current capacity to the power of 2.
int newCapacity = calculateNewCapacity(minNewCapacity);
int newCapacity = calculateNewCapacity(writerIndex + minWritableBytes);
// Adjust to the new capacity.
capacity(newCapacity);
}
private int calculateNewCapacity(int minNewCapacity) {
final int maxCapacity = this.maxCapacity;
final int threshold = 1048576 * 4; // 4 MiB page
if (minNewCapacity == threshold) {
@ -223,7 +221,8 @@ public abstract class AbstractByteBuf implements ByteBuf {
while (newCapacity < minNewCapacity) {
newCapacity <<= 1;
}
return newCapacity;
return Math.min(newCapacity, maxCapacity);
}
@Override