Changeset 92260 in webkit


Ignore:
Timestamp:
Aug 2, 2011 9:37:51 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

WebSocket: Should be closed by receiving invalid continuation frame.

https://bugs.webkit.org/show_bug.cgi?id=65527

Patch by Takashi Toyoshima <toyoshim@chromium.org> on 2011-08-02
Reviewed by Kent Tamura.

Source/WebCore:

Test: http/tests/websocket/tests/hybi/invalid-continuation.html

  • websockets/WebSocketChannel.cpp:

(WebCore::WebSocketChannel::processFrame):

LayoutTests:

  • http/tests/websocket/tests/hybi/invalid-continuation-expected.txt: Added.
  • http/tests/websocket/tests/hybi/invalid-continuation.html: Added.
  • http/tests/websocket/tests/hybi/invalid-continuation_wsh.py: Added.
Location:
trunk
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r92258 r92260  
     12011-08-02  Takashi Toyoshima  <toyoshim@chromium.org>
     2
     3        WebSocket: Should be closed by receiving invalid continuation frame.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=65527
     6
     7        Reviewed by Kent Tamura.
     8
     9        * http/tests/websocket/tests/hybi/invalid-continuation-expected.txt: Added.
     10        * http/tests/websocket/tests/hybi/invalid-continuation.html: Added.
     11        * http/tests/websocket/tests/hybi/invalid-continuation_wsh.py: Added.
     12
    1132011-08-02  James Robinson  <jamesr@chromium.org>
    214
  • trunk/Source/WebCore/ChangeLog

    r92259 r92260  
     12011-08-02  Takashi Toyoshima  <toyoshim@chromium.org>
     2
     3        WebSocket: Should be closed by receiving invalid continuation frame.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=65527
     6
     7        Reviewed by Kent Tamura.
     8
     9        Test: http/tests/websocket/tests/hybi/invalid-continuation.html
     10
     11        * websockets/WebSocketChannel.cpp:
     12        (WebCore::WebSocketChannel::processFrame):
     13
    1142011-08-02  Sheriff Bot  <webkit.review.bot@gmail.com>
    215
  • trunk/Source/WebCore/websockets/WebSocketChannel.cpp

    r92116 r92260  
    543543    switch (frame.opCode) {
    544544    case OpCodeContinuation:
     545        // An unexpected continuation frame is received without any leading frame.
     546        if (!m_hasContinuousFrame) {
     547            fail("Received unexpected continuation frame.");
     548            return false;
     549        }
    545550        // Throw away content of a binary message because binary messages are not supported yet.
    546551        if (m_continuousFrameOpCode == OpCodeText)
Note: See TracChangeset for help on using the changeset viewer.