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

[#707] Fix IndexOutOfBoundsException which could accour when the buffer is consolitated in the middle of an operation

Browse Source
This commit is contained in:
Norman Maurer 2012-11-03 20:00:48 +01:00
parent 0526e1cb06
commit 4e3258973f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buffer/src/main/java/io/netty/buffer/DefaultCompositeByteBuf.java
View File

@ -181,7 +181,7 @@ public class DefaultCompositeByteBuf extends AbstractByteBuf implements Composit
// Consolidate if the number of components will exceed the maximum by this operation.
final int numComponents = components.size();
if (numComponents + cnt > maxNumComponents) {
if (numComponents + cnt >= maxNumComponents) {
final ByteBuf consolidated;
if (numComponents != 0) {
final int capacity = components.get(numComponents - 1).endOffset + readableBytes;
@ -230,6 +230,11 @@ public class DefaultCompositeByteBuf extends AbstractByteBuf implements Composit
if (b.readable()) {
addComponent(cIndex ++, b);
int size = components.size();
if (cIndex > size) {
// was consolidated, so adjust index. #707
cIndex = size;
}
}
}
return this;