IPEndPoint::ToString should not crash when the IP address is empty.

content/browser/renderer_host/p2p/socket_host_tcp.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 "content/browser/renderer_host/p2p/socket_host_tcp.h"
 
 #include "base/sys_byteorder.h"
 #include "content/common/p2p_messages.h"
 #include "ipc/ipc_sender.h"
 #include "jingle/glue/fake_ssl_client_socket.h"
@@ skipping 124 matching lines @@
   }
 
   state_ = STATE_ERROR;
 }
 
 void P2PSocketHostTcpBase::OnConnected(int result) {
   DCHECK_EQ(state_, STATE_CONNECTING);
   DCHECK_NE(result, net::ERR_IO_PENDING);
 
   if (result != net::OK) {
+    LOG(WARNING) << "Error from connecting socket, result=" << result;
     OnError();
     return;
   }
 
   if (IsTlsClientSocket(type_)) {
     state_ = STATE_TLS_CONNECTING;
     StartTls();
   } else if (IsPseudoTlsClientSocket(type_)) {
     scoped_ptr<net::StreamSocket> transport_socket = socket_.Pass();
     socket_.reset(
@@ skipping 44 matching lines @@
 
   net::ClientSocketFactory* socket_factory =
       net::ClientSocketFactory::GetDefaultFactory();
   DCHECK(socket_factory);
 
   socket_ = socket_factory->CreateSSLClientSocket(
       socket_handle.Pass(), dest_host_port_pair, ssl_config, context);
   int status = socket_->Connect(
       base::Bind(&P2PSocketHostTcpBase::ProcessTlsSslConnectDone,
                  base::Unretained(this)));
+
   if (status != net::ERR_IO_PENDING) {
     ProcessTlsSslConnectDone(status);
   }
 }
 
 void P2PSocketHostTcpBase::ProcessTlsSslConnectDone(int status) {
   DCHECK_NE(status, net::ERR_IO_PENDING);
   DCHECK_EQ(state_, STATE_TLS_CONNECTING);
   if (status != net::OK) {
+    LOG(WARNING) << "Error from connecting TLS socket, status=" << status;
     OnError();
     return;
   }
   OnOpen();
 }
 
 void P2PSocketHostTcpBase::OnOpen() {
   state_ = STATE_OPEN;
   // Setting socket send and receive buffer size.
   if (net::OK != socket_->SetReceiveBufferSize(kRecvSocketBufferSize)) {
@@ skipping 22 matching lines @@
     LOG(ERROR) << "P2PSocketHostTcpBase::OnConnected: unable to get local"
                << " address: " << result;
     OnError();
     return false;
   }
 
   VLOG(1) << "Local address: " << local_address.ToString();
 
   net::IPEndPoint remote_address;
 
-  // |remote_address| could be empty if it is connected through a proxy.
+  // GetPeerAddress returns ERR_NAME_NOT_RESOLVED if the socket is connected
+  // through a proxy.
   result = socket_->GetPeerAddress(&remote_address);
-  if (result < 0) {
+  if (result < 0 && result != net::ERR_NAME_NOT_RESOLVED) {
     LOG(ERROR) << "P2PSocketHostTcpBase::OnConnected: unable to get peer"
                << " address: " << result;
     OnError();
     return false;
   }
-  VLOG(1) << "Remote address: " << remote_address.ToString();
-  if (remote_address_.ip_address.address().empty() &&
-      !remote_address.address().empty()) {
-    // Save |remote_address| if address is empty.
-    remote_address_.ip_address = remote_address;
+
+  if (!remote_address.address().empty()) {
+    VLOG(1) << "Remote address: " << remote_address.ToString();
+    if (remote_address_.ip_address.address().empty()) {
+      // Save |remote_address| if address is empty.
+      remote_address_.ip_address = remote_address;
+    }
+  } else {
+    VLOG(1) << "Cannot get remote address due to proxy.";

[Sergey Ulanov, 2015/03/11 18:35:22]

Suggest rewording: "Remote address is unknown, connection is proxied."

   }
 
   // If we are not doing TLS, we are ready to send data now.
   // In case of TLS SignalConnect will be sent only after TLS handshake is
   // successful. So no buffering will be done at socket handlers if any
   // packets sent before that by the application.
   message_sender_->Send(new P2PMsg_OnSocketCreated(
       id_, local_address, remote_address));
   return true;
 }
@@ skipping 335 matching lines @@
   } else {
     packet_size += kTurnChannelDataHeaderSize;
     // Calculate any padding if present.
     if (packet_size % 4)
       *pad_bytes = 4 - packet_size % 4;
   }
   return packet_size;
 }
 
 }  // namespace content