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

Unified Diff: remoting/host/win/rdp_client.cc

Issue 655063002: Use uint16 for port numbers more pervasively. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert bad change Created 6 years, 1 month 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 | « remoting/host/remoting_me2me_host.cc ('k') | remoting/protocol/chromium_socket_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/win/rdp_client.cc
diff --git a/remoting/host/win/rdp_client.cc b/remoting/host/win/rdp_client.cc
index 80868dafe92af099fab45909b8130904db3dd54f..fcfce89008e946a0dbc87bf6c8863efff7347823 100644
--- a/remoting/host/win/rdp_client.cc
+++ b/remoting/host/win/rdp_client.cc
@@ -136,14 +136,16 @@ void RdpClient::Core::Connect(const webrtc::DesktopSize& screen_size,
DWORD server_port;
base::win::RegKey key(HKEY_LOCAL_MACHINE, kRdpPortKeyName, KEY_READ);
if (!key.Valid() ||
- (key.ReadValueDW(kRdpPortValueName, &server_port) != ERROR_SUCCESS)) {
+ (key.ReadValueDW(kRdpPortValueName, &server_port) != ERROR_SUCCESS) ||
+ server_port > 65535) {
server_port = kDefaultRdpPort;
}
net::IPAddressNumber server_address(
kRdpLoopbackAddress,
kRdpLoopbackAddress + arraysize(kRdpLoopbackAddress));
- net::IPEndPoint server_endpoint(server_address, server_port);
+ net::IPEndPoint server_endpoint(server_address,
+ static_cast<uint16>(server_port));
// Create the ActiveX control window.
rdp_client_window_.reset(new RdpClientWindow(server_endpoint, terminal_id,
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | remoting/protocol/chromium_socket_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698