Chromium Code Reviews| 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) { |
|
Peter Kasting
2014/11/12 23:53:55
Another case where the old code could have just si
|
| 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, |