Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Unified Diff: jingle/glue/proxy_resolving_client_socket.cc

Issue 976903002: IPEndPoint::ToString should not crash when the IP address is empty. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/p2p/socket_host_tcp.cc ('k') | net/base/ip_endpoint.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/glue/proxy_resolving_client_socket.cc
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc
index 0b35559d5509cf0975f53565e09f32b385294950..cc9371011d502adea9548502e2fe10cc77ad6ee2 100644
--- a/jingle/glue/proxy_resolving_client_socket.cc
+++ b/jingle/glue/proxy_resolving_client_socket.cc
@@ -350,17 +350,17 @@ int ProxyResolvingClientSocket::GetPeerAddress(
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 {
- *address =
- net::IPEndPoint(net::IPAddressNumber(), dest_host_port_pair_.port());
+ if (!net::ParseIPLiteralToNumber(dest_host_port_pair_.host(), &ip_number)) {
+ // Do not expose the proxy IP address to the caller.
+ return net::ERR_NAME_NOT_RESOLVED;
}
+ *address = net::IPEndPoint(ip_number, dest_host_port_pair_.port());
return net::OK;
}
« no previous file with comments | « content/browser/renderer_host/p2p/socket_host_tcp.cc ('k') | net/base/ip_endpoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698