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

jingle/glue/proxy_resolving_client_socket.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 "jingle/glue/proxy_resolving_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
@@ skipping 332 matching lines @@
     return false;
   return transport_->socket()->IsConnectedAndIdle();
 }
 
 int ProxyResolvingClientSocket::GetPeerAddress(
     net::IPEndPoint* address) const {
   if (!transport_.get() || !transport_->socket()) {
     NOTREACHED();
     return net::ERR_SOCKET_NOT_CONNECTED;
   }
+
   if (proxy_info_.is_direct())
     return transport_->socket()->GetPeerAddress(address);
 
   net::IPAddressNumber ip_number;
-  if (net::ParseIPLiteralToNumber(dest_host_port_pair_.host(), &ip_number)) {
-    *address = net::IPEndPoint(ip_number, dest_host_port_pair_.port());
-  } else {
+  if (!net::ParseIPLiteralToNumber(dest_host_port_pair_.host(), &ip_number)) {
+    // Do not expose the proxy IP address to the caller.
     *address =
         net::IPEndPoint(net::IPAddressNumber(), dest_host_port_pair_.port());

[Ryan Sleevi, 2015/03/06 21:23:41]

BUG: Don't assign to *address

Just return an error (similar to line 351)

+    return net::ERR_NAME_NOT_RESOLVED;
   }
 
+  *address = net::IPEndPoint(ip_number, dest_host_port_pair_.port());
   return net::OK;
 }
 
 int ProxyResolvingClientSocket::GetLocalAddress(
     net::IPEndPoint* address) const {
   if (transport_.get() && transport_->socket())
     return transport_->socket()->GetLocalAddress(address);
   NOTREACHED();
   return net::ERR_SOCKET_NOT_CONNECTED;
 }
@@ skipping 48 matching lines @@
   return false;
 }
 
 void ProxyResolvingClientSocket::CloseTransportSocket() {
   if (transport_.get() && transport_->socket())
     transport_->socket()->Disconnect();
   transport_.reset();
 }
 
 }  // namespace jingle_glue