Use uint16 for port numbers more pervasively.

remoting/host/win/rdp_client.cc

 // Copyright (c) 2013 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 "remoting/host/win/rdp_client.h"
 
 #include <windows.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 118 matching lines @@
   }
 
   DCHECK(base::MessageLoopForUI::IsCurrent());
   DCHECK(!rdp_client_window_);
   DCHECK(!self_);
 
   // Read the port number used by RDP.
   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,
                                                this));
   if (!rdp_client_window_->Connect(screen_size)) {
     rdp_client_window_.reset();
 
     // Notify the caller that connection attempt failed.
     NotifyClosed();
   }
@@ skipping 68 matching lines @@
   }
 
   if (event_handler_) {
     RdpClient::EventHandler* event_handler = event_handler_;
     event_handler_ = NULL;
     event_handler->OnRdpClosed();
   }
 }
 
 }  // namespace remoting