From 5a59cb9fb7e2ed949c7194cb574c9fad1daad4e1 Mon Sep 17 00:00:00 2001
From: Norman Maurer <nmaurer@redhat.com>
Date: Tue, 1 Oct 2013 07:32:07 +0200
Subject: [PATCH] [#1879] Correctly validate close frame

---
 .../codec/http/websocketx/WebSocket08FrameDecoder.java       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
index d6a22afb7a..e34a3a2dc4 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
@@ -443,10 +443,10 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder<WebSocket08FrameDe
     /** */
     protected void checkCloseFrameBody(
             ChannelHandlerContext ctx, ByteBuf buffer) {
-        if (buffer == null || buffer.capacity() == 0) {
+        if (buffer == null || !buffer.isReadable()) {
             return;
         }
-        if (buffer.capacity() == 1) {
+        if (buffer.readableBytes() == 1) {
             protocolViolation(ctx, "Invalid close frame body");
         }
 
@@ -463,7 +463,6 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder<WebSocket08FrameDe
 
         // May have UTF-8 message
         if (buffer.isReadable()) {
-
             try {
                 new UTF8Output(buffer);
             } catch (UTF8Exception ex) {