Add WebSocketError to indicate decoding failure reason

net/websockets/websocket_frame_parser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/websockets/websocket_frame_parser.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/basictypes.h"
@@ skipping 18 matching lines @@
 const uint64 kPayloadLengthWithTwoByteExtendedLengthField = 126;
 const uint64 kPayloadLengthWithEightByteExtendedLengthField = 127;
 
 }  // Unnamed namespace.
 
 namespace net {
 
 WebSocketFrameParser::WebSocketFrameParser()
     : current_read_pos_(0),
       frame_offset_(0),
-      failed_(false) {
+      websocket_error_(WEB_SOCKET_OK) {
   std::fill(masking_key_,
             masking_key_ + WebSocketFrameHeader::kMaskingKeyLength,
             '\0');
 }
 
 WebSocketFrameParser::~WebSocketFrameParser() {
 }
 
 bool WebSocketFrameParser::Decode(
     const char* data,
     size_t length,
     ScopedVector<WebSocketFrameChunk>* frame_chunks) {
-  if (failed_)
+  if (websocket_error_ != WEB_SOCKET_OK)
     return false;
   if (!length)
     return true;
 
   // TODO(yutak): Remove copy.
   buffer_.insert(buffer_.end(), data, data + length);
 
   while (current_read_pos_ < buffer_.size()) {
     bool first_chunk = false;
     if (!current_frame_header_.get()) {
       DecodeFrameHeader();
-      if (failed_)
+      if (websocket_error_ != WEB_SOCKET_OK)
         return false;
       // If frame header is incomplete, then carry over the remaining
       // data to the next round of Decode().
       if (!current_frame_header_.get())
         break;
       first_chunk = true;
     }
 
     scoped_ptr<WebSocketFrameChunk> frame_chunk =
         DecodeFramePayload(first_chunk);
@@ skipping 39 matching lines @@
   uint8 second_byte = *current++;
 
   bool final = (first_byte & kFinalBit) != 0;
   bool reserved1 = (first_byte & kReserved1Bit) != 0;
   bool reserved2 = (first_byte & kReserved2Bit) != 0;
   bool reserved3 = (first_byte & kReserved3Bit) != 0;
   OpCode opcode = first_byte & kOpCodeMask;
 
   bool masked = (second_byte & kMaskBit) != 0;
   uint64 payload_length = second_byte & kPayloadLengthMask;
-  bool valid_length_format = true;
-  bool message_too_big = false;
   if (payload_length == kPayloadLengthWithTwoByteExtendedLengthField) {
     if (end - current < 2)
       return;
     uint16 payload_length_16;
     ReadBigEndian(current, &payload_length_16);
     current += 2;
     payload_length = payload_length_16;
     if (payload_length <= kMaxPayloadLengthWithoutExtendedLengthField)
-      valid_length_format = false;
+      websocket_error_ = WEB_SOCKET_ERR_PROTOCOL_ERROR;
   } else if (payload_length == kPayloadLengthWithEightByteExtendedLengthField) {
     if (end - current < 8)
       return;
     ReadBigEndian(current, &payload_length);
     current += 8;
     if (payload_length <= kuint16max ||
         payload_length > static_cast<uint64>(kint64max)) {
-      valid_length_format = false;
+      websocket_error_ = WEB_SOCKET_ERR_PROTOCOL_ERROR;
+    } else if (payload_length > static_cast<uint64>(kint32max)) {
+      websocket_error_ = WEB_SOCKET_ERR_MESSAGE_TOO_BIG;
     }
-    if (payload_length > static_cast<uint64>(kint32max))
-      message_too_big = true;
   }
-  if (!valid_length_format || message_too_big) {
-    failed_ = true;
+  if (websocket_error_ != WEB_SOCKET_OK) {
     buffer_.clear();
     current_read_pos_ = 0;
     current_frame_header_.reset();
     frame_offset_ = 0;
     return;
   }
 
   if (masked) {
     if (end - current < kMaskingKeyLength)
       return;
@@ skipping 56 matching lines @@
   if (frame_offset_ == current_frame_header_->payload_length) {
     frame_chunk->final_chunk = true;
     current_frame_header_.reset();
     frame_offset_ = 0;
   }
 
   return frame_chunk.Pass();
 }
 
 }  // namespace net