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

[#1879] Correctly validate close frame

Browse Source
This commit is contained in:
Norman Maurer 2013-10-01 07:32:07 +02:00
parent aaafdf909d
commit 5a59cb9fb7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
View File

@ -443,10 +443,10 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder<WebSocket08FrameDe
/** */ /** */
protected void checkCloseFrameBody( protected void checkCloseFrameBody(
ChannelHandlerContext ctx, ByteBuf buffer) { ChannelHandlerContext ctx, ByteBuf buffer) {
if (buffer == null || buffer.capacity() == 0) { if (buffer == null || !buffer.isReadable()) {
return; return;
} }
if (buffer.capacity() == 1) { if (buffer.readableBytes() == 1) {
protocolViolation(ctx, "Invalid close frame body"); protocolViolation(ctx, "Invalid close frame body");
} }
@ -463,7 +463,6 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder<WebSocket08FrameDe
// May have UTF-8 message // May have UTF-8 message
if (buffer.isReadable()) { if (buffer.isReadable()) {
try { try {
new UTF8Output(buffer); new UTF8Output(buffer);
} catch (UTF8Exception ex) { } catch (UTF8Exception ex) {