From aaafdf909ddefe7844eb3b1c8f1b6c2adf31fa10 Mon Sep 17 00:00:00 2001
From: Norman Maurer <nmaurer@redhat.com>
Date: Tue, 1 Oct 2013 07:18:16 +0200
Subject: [PATCH] [#1878] Fix leak of ByteBuf when masked payload is used

---
 .../codec/http/websocketx/WebSocket08FrameDecoder.java   | 9 ++++++---
 1 file changed, 6 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 53c061157a..d6a22afb7a 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
@@ -91,7 +91,7 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder<WebSocket08FrameDe
     private long framePayloadLength;
     private ByteBuf framePayload;
     private int framePayloadBytesRead;
-    private ByteBuf maskingKey;
+    private byte[] maskingKey;
     private ByteBuf payloadBuffer;
 
     private final boolean allowExtensions;
@@ -244,7 +244,10 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder<WebSocket08FrameDe
                     checkpoint(State.MASKING_KEY);
                 case MASKING_KEY:
                     if (maskedPayload) {
-                        maskingKey = in.readBytes(4);
+                        if (maskingKey == null) {
+                            maskingKey = new byte[4];
+                        }
+                        in.readBytes(maskingKey);
                     }
                     checkpoint(State.PAYLOAD);
                 case PAYLOAD:
@@ -405,7 +408,7 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder<WebSocket08FrameDe
 
     private void unmask(ByteBuf frame) {
         for (int i = frame.readerIndex(); i < frame.writerIndex(); i++) {
-            frame.setByte(i, frame.getByte(i) ^ maskingKey.getByte(i % 4));
+            frame.setByte(i, frame.getByte(i) ^ maskingKey[i % 4]);
         }
     }