Fix crash bug in SpdyProxyClientSocket.GetPeerAddress where

net/spdy/spdy_proxy_client_socket.cc

 // Copyright (c) 2011 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/spdy/spdy_proxy_client_socket.h"
 
 #include <algorithm>  // min
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 106 matching lines @@
 
   next_state_ = STATE_DISCONNECTED;
 
   if (spdy_stream_)
     // This will cause OnClose to be invoked, which takes care of
     // cleaning up all the internal state.
     spdy_stream_->Cancel();
 }
 
 bool SpdyProxyClientSocket::IsConnected() const {
   return next_state_ == STATE_OPEN || next_state_ == STATE_CLOSED;

[wtc, 2011/12/01 22:22:15]

It seems that IsConnected() should return false if
next_state_ is STATE_CLOSED or spdy_stream_ is NULL.
I don't understand this "closed but still connected" state.
Could you explain?

[Ryan Hamilton, 2011/12/02 22:24:13]

Done.

 }
 
 bool SpdyProxyClientSocket::IsConnectedAndIdle() const {
-  return IsConnected() && spdy_stream_.get() != NULL &&
-      !spdy_stream_->is_idle();
+  return IsConnected() && spdy_stream_ && !spdy_stream_->is_idle();
 }
 
 const BoundNetLog& SpdyProxyClientSocket::NetLog() const {
   return net_log_;
 }
 
 void SpdyProxyClientSocket::SetSubresourceSpeculation() {
   // TODO(rch): what should this implementation be?
 }
 
@@ skipping 115 matching lines @@
 
 bool SpdyProxyClientSocket::SetSendBufferSize(int32 size) {
   // Since this StreamSocket sits on top of a shared SpdySession, it
   // is not safe for callers to set change this underlying socket.
   return false;
 }
 
 int SpdyProxyClientSocket::GetPeerAddress(AddressList* address) const {
   if (!IsConnected())
     return ERR_SOCKET_NOT_CONNECTED;
-  return spdy_stream_->GetPeerAddress(address);
+  *address = peer_address_;

[wtc, 2011/12/01 22:22:15]

Is it normal for spdy_stream_ to become NULL when IsConnected()
is true?

[Ryan Hamilton, 2011/12/02 22:24:13]

It was, but because of the change you suggested this is no longer true.

+  return OK;
 }
 
 int SpdyProxyClientSocket::GetLocalAddress(IPEndPoint* address) const {
   if (!IsConnected())
     return ERR_SOCKET_NOT_CONNECTED;
-  return spdy_stream_->GetLocalAddress(address);
+  *address = local_address_;
+  return OK;
 }
 
 void SpdyProxyClientSocket::OnIOComplete(int result) {
   DCHECK_NE(STATE_DISCONNECTED, next_state_);
   int rv = DoLoop(result);
   if (rv != ERR_IO_PENDING) {
     OldCompletionCallback* c = read_callback_;
     read_callback_ = NULL;
     c->Run(rv);
   }
@@ skipping 97 matching lines @@
   // we are notified by a callback when the SYN_REPLY frame arrives
 
   if (result < 0)
     return result;
 
   // Require the "HTTP/1.x" status line for SSL CONNECT.
   if (response_.headers->GetParsedHttpVersion() < HttpVersion(1, 0))
     return ERR_TUNNEL_CONNECTION_FAILED;
 
   next_state_ = STATE_OPEN;
+  spdy_stream_->GetPeerAddress(&peer_address_);
+  spdy_stream_->GetLocalAddress(&local_address_);
+
   if (net_log_.IsLoggingAllEvents()) {
     net_log_.AddEvent(
         NetLog::TYPE_HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS,
         make_scoped_refptr(new NetLogHttpResponseParameter(response_.headers)));
   }
 
   if (response_.headers->response_code() == 200) {
     return OK;
   } else if (response_.headers->response_code() == 407) {
     int rv = HandleAuthChallenge(auth_, &response_, net_log_);
@@ skipping 134 matching lines @@
   }
   // This may have been deleted by read_callback_, so check first.
   if (weak_ptr && write_callback)
     write_callback->Run(ERR_CONNECTION_CLOSED);
 }
 
 void SpdyProxyClientSocket::set_chunk_callback(ChunkCallback* /*callback*/) {
 }
 
 }  // namespace net