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

Fix intermittent infinite loop in AbstractOioByteChannel.doRead()

Browse Source 
- OioByteStreamChannel.doReadBytes() did not expand the capacity of the inbound buffer properly.
This commit is contained in:
Trustin Lee 2013-04-23 22:12:07 +09:00
parent 32fa4c07f3
commit f03b2cde62
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
transport/src/main/java/io/netty/channel/oio/OioByteStreamChannel.java
View File

@ -84,13 +84,7 @@ public abstract class OioByteStreamChannel extends AbstractOioByteChannel {
@Override @Override
protected int doReadBytes(ByteBuf buf) throws Exception { protected int doReadBytes(ByteBuf buf) throws Exception {
int length = available(); int length = Math.max(1, Math.min(available(), buf.maxWritableBytes()));
if (length < 1) {
length = 1;
}
if (length > buf.writableBytes()) {
length = buf.writableBytes();
}
return buf.writeBytes(is, length); return buf.writeBytes(is, length);
} }