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

Fix an infinite loop in DefaultCompositeByteBuf.setBytes()

Browse Source
This commit is contained in:
Trustin Lee 2012-08-08 17:42:58 +09:00
parent a2aadef4da
commit 501746aeff
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -884,6 +884,18 @@ public class DefaultCompositeByteBuf extends AbstractByteBuf implements Composit
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
int localReadBytes = s.setBytes(index - adjustment, in, localLength); int localReadBytes = s.setBytes(index - adjustment, in, localLength);
if (localReadBytes == 0) {
break;
}
if (localReadBytes < 0) {
if (readBytes == 0) {
return -1;
} else {
break;
}
}
if (localReadBytes == localLength) { if (localReadBytes == localLength) {
index += localLength; index += localLength;
length -= localLength; length -= localLength;