Fix Web Socket protocol bug when reading message payload

1 files changed, 8 insertions, 4 deletions

diff --git a/cpp/src/Ice/WSTransceiver.cpp b/cpp/src/Ice/WSTransceiver.cpp
index 08764fbc267..a1f27ef48a8 100644
--- a/cpp/src/Ice/WSTransceiver.cpp
+++ b/cpp/src/Ice/WSTransceiver.cpp
@@ -1370,19 +1370,23 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
                 return false;
             }
 
-            if(_readI < _readBuffer.i)
+            size_t n = min(_readBuffer.i - _readI, buf.b.end() - buf.i);
+
+            if(n > _readPayloadLength)
+            {
+                n = _readPayloadLength;
+            }
+            if(n > 0)
             {
-                size_t n = min(_readBuffer.i - _readI, buf.b.end() - buf.i);
                 memcpy(buf.i, _readI, n);
                 buf.i += n;
                 _readI += n;
             }
-
             //
             // Continue reading if we didn't read the full message, otherwise give back
             // the control to the connection
             //
-            return buf.i < buf.b.end();
+            return buf.i < buf.b.end() && n < _readPayloadLength;
         }
     }
 }