Clean up the last remaining bits of SpdySynReplyControlFrame.

net/spdy/spdy_framer.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.
 
 // TODO(rtenhove) clean up frame buffer size calculations so that we aren't
 // constantly adding and subtracting header sizes; this is ugly and error-
 // prone.
 
 #include "net/spdy/spdy_framer.h"
 
@@ skipping 1002 matching lines @@
                                                   size_t data_len) {
   DCHECK_EQ(SPDY_CONTROL_FRAME_HEADER_BLOCK, state_);
   const SpdyControlFrame control_frame(current_frame_buffer_.get(), false);
 
   bool processed_successfully = true;
   SpdyStreamId stream_id = kInvalidStream;
   if (control_frame.type() == SYN_STREAM) {
     stream_id = reinterpret_cast<const SpdySynStreamControlFrame*>(
         &control_frame)->stream_id();
   } else if (control_frame.type() == SYN_REPLY) {
-    stream_id = reinterpret_cast<const SpdySynReplyControlFrame*>(
-        &control_frame)->stream_id();
+    SpdyFrameReader reader(current_frame_buffer_.get(), current_frame_len_);
+    reader.Seek(SpdyFrame::kHeaderSize);  // Seek past frame header.
+    bool read_successful = reader.ReadUInt31(&stream_id);
+    DCHECK(read_successful);
   } else if (control_frame.type() == HEADERS) {
     stream_id = reinterpret_cast<const SpdyHeadersControlFrame*>(
         &control_frame)->stream_id();
   } else {
     LOG(DFATAL) << "Unhandled frame type in ProcessControlFrameHeaderBlock.";
   }
   size_t process_bytes = std::min(data_len, remaining_control_payload_);
   if (process_bytes > 0) {
     if (enable_compression_) {
       processed_successfully = IncrementallyDecompressControlFrameHeaderData(
@@ skipping 766 matching lines @@
         {
           const SpdySynStreamControlFrame& syn_frame =
               reinterpret_cast<const SpdySynStreamControlFrame&>(frame);
           frame_size = SpdySynStreamControlFrame::size();
           *payload_length = syn_frame.header_block_len();
           *header_length = frame_size;
           *payload = frame.data() + *header_length;
         }
         break;
       case SYN_REPLY:
-        {
-          *header_length = GetSynReplyMinimumSize();
-          *payload_length = frame.length() -
-              (*header_length - GetControlFrameMinimumSize());
-          *payload = frame.data() + *header_length;
-        }
+        *header_length = GetSynReplyMinimumSize();
+        *payload_length = frame.length() -
+            (*header_length - GetControlFrameMinimumSize());
+        *payload = frame.data() + *header_length;
         break;
       case HEADERS:
         {
           const SpdyHeadersControlFrame& headers_frame =
               reinterpret_cast<const SpdyHeadersControlFrame&>(frame);
           frame_size = SpdyHeadersControlFrame::size();
           *payload_length = headers_frame.header_block_len();
           *header_length = frame_size;
           *payload = frame.data() + *header_length;
           // SPDY 2 had two bytes of unused space preceeding payload.
@@ skipping 233 matching lines @@
       builder->WriteString(it->first);
       builder->WriteString(it->second);
     } else {
       builder->WriteStringPiece32(it->first);
       builder->WriteStringPiece32(it->second);
     }
   }
 }
 
 }  // namespace net