Fix the hostname used to setup a TURN/TSL connection.

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 168 matching lines @@
 
   net::SSLClientSocketContext context;
   context.cert_verifier = url_context_->GetURLRequestContext()->cert_verifier();
   context.transport_security_state =
       url_context_->GetURLRequestContext()->transport_security_state();
   DCHECK(context.transport_security_state);
 
   // Default ssl config.
   const net::SSLConfig ssl_config;
   net::HostPortPair dest_host_port_pair;
-  if (remote_address_.ip_address.address().empty()) {
-    DCHECK(!remote_address_.hostname.empty());
-    dest_host_port_pair = net::HostPortPair::FromString(
-        remote_address_.hostname);
+
+  // Calling net::HostPortPair::FromIPEndPoint will crash if the IP address is
+  // empty.
+  if (!remote_address_.ip_address.address().empty()) {
+      net::HostPortPair::FromIPEndPoint(remote_address_.ip_address);
   } else {
-    dest_host_port_pair = net::HostPortPair::FromIPEndPoint(
-        remote_address_.ip_address);
-    if (!remote_address_.hostname.empty())
-      dest_host_port_pair.set_host(remote_address_.hostname);
+    dest_host_port_pair.set_port(remote_address_.ip_address.port());
   }
+  if (!remote_address_.hostname.empty())
+    dest_host_port_pair.set_host(remote_address_.hostname);
 
   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)));
@@ skipping 392 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