Changeset 252847 in webkit

Timestamp:

Nov 25, 2019 12:50:13 AM (4 years ago)

Author:

youenn@apple.com

Message:

REGRESSION (Safari 13): WebSocket payload is truncated when x-webkit-deflate-frame is used
​https://bugs.webkit.org/show_bug.cgi?id=202401
<rdar://problem/55922632>

Reviewed by Alex Christensen.

Source/WebCore:

Test: http/tests/websocket/tests/hybi/deflate-extension.html

• Modules/websockets/WebSocketDeflater.cpp:

(WebCore::WebSocketDeflater::finish):
Make sure to continue calling deflate until all output data is flushed.

LayoutTests:

• http/tests/websocket/tests/hybi/deflate-extension-expected.txt: Added.
• http/tests/websocket/tests/hybi/deflate-extension.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/websocket/tests/hybi/deflate-extension-expected.txt (added)
• LayoutTests/http/tests/websocket/tests/hybi/deflate-extension.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/websockets/WebSocketDeflater.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-11-25  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION (Safari 13): WebSocket payload is truncated when x-webkit-deflate-frame is used
+        https://bugs.webkit.org/show_bug.cgi?id=202401
+        <rdar://problem/55922632>
+
+        Reviewed by Alex Christensen.
+
+        * http/tests/websocket/tests/hybi/deflate-extension-expected.txt: Added.
+        * http/tests/websocket/tests/hybi/deflate-extension.html: Added.
+
 2019-11-25  youenn fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-25  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION (Safari 13): WebSocket payload is truncated when x-webkit-deflate-frame is used
+        https://bugs.webkit.org/show_bug.cgi?id=202401
+        <rdar://problem/55922632>
+
+        Reviewed by Alex Christensen.
+
+        Test: http/tests/websocket/tests/hybi/deflate-extension.html
+
+        * Modules/websockets/WebSocketDeflater.cpp:
+        (WebCore::WebSocketDeflater::finish):
+        Make sure to continue calling deflate until all output data is flushed.
+
 2019-11-24  Sunny He  <sunny_he@apple.com>
 

trunk/Source/WebCore/Modules/websockets/WebSocketDeflater.cpp

@@ -102 +102 @@
         setStreamParameter(m_stream.get(), 0, 0, m_buffer.data() + writePosition, availableCapacity);
         int result = deflate(m_stream.get(), Z_SYNC_FLUSH);
-        m_buffer.shrink(writePosition + availableCapacity - m_stream->avail_out);
-        if (result == Z_OK)
-            break;
-        if (result != Z_BUF_ERROR)
-            return false;
+        if (m_stream->avail_out) {
+            m_buffer.shrink(writePosition + availableCapacity - m_stream->avail_out);
+            if (result == Z_OK)
+                break;
+            if (result != Z_BUF_ERROR)
+                return false;
+        }
     }
     // Remove 4 octets from the tail as the specification requires.