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

[#1060] Fix bug in CompositeByteBuf which let the buffer expand in a incorrect way and so result in corrupted data

Browse Source
This commit is contained in:
Norman Maurer 2013-02-19 09:43:31 +01:00
parent 891cf343ca
commit 4ed5b07e4e
2 changed files with 13 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/DefaultCompositeByteBuf.java
View File

@ -451,7 +451,7 @@ public class DefaultCompositeByteBuf extends AbstractReferenceCountedByteBuf
if (nComponents < maxNumComponents) {
padding = allocBuffer(paddingLength);
padding.setIndex(0, paddingLength);
addComponent0(0, padding);
addComponent0(components.size(), padding);
} else {
padding = allocBuffer(paddingLength);
padding.setIndex(0, paddingLength);

12
buffer/src/test/java/io/netty/buffer/AbstractCompositeByteBufTest.java
View File

@ -418,4 +418,16 @@ public abstract class AbstractCompositeByteBufTest extends
b.readBytes(new byte[4]);
b.readBytes(new byte[0]);
}
// Test for https://github.com/netty/netty/issues/1060
@Test
public void testReadWithEmptyCompositeBuffer() {
ByteBuf buf = compositeBuffer();
int n = 65;
for (int i=0; i<n; ++i) {
buf.writeByte(1);
assertEquals(1, buf.readByte());
}
}
}