Use uint16 for port numbers, net/ edition

net/base/net_util.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 "net/base/net_util.h"
 
 #include <errno.h>
 #include <string.h>
 
 #include <algorithm>
@@ skipping 283 matching lines @@
   return StripWWW(base::ASCIIToUTF16(url.host()));
 }
 
 bool IsPortAllowedByDefault(int port) {
   int array_size = arraysize(kRestrictedPorts);
   for (int i = 0; i < array_size; i++) {
     if (kRestrictedPorts[i] == port) {
       return false;
     }
   }
-  return true;
+  return port >= 0 && port <= 65535;

[Peter Kasting, 2014/11/12 23:54:31]

This ensures it's safe to cast the port number to uint16 in places like
ftp_network_transaction.cc.

[mmenke, 2014/11/13 16:00:42]

Not a big fan of depending on this for correctness, but since it doesn't look
like we had any better protection for this case before, that's beyond the scope
of this CL.

 }
 
 bool IsPortAllowedByFtp(int port) {
   int array_size = arraysize(kAllowedFtpPorts);
   for (int i = 0; i < array_size; i++) {
     if (kAllowedFtpPorts[i] == port) {
         return true;
     }
   }
   // Port not explicitly allowed by FTP, so return the default restrictions.
@@ skipping 246 matching lines @@
 
 #if defined(OS_WIN)
   if (sock_addr->sa_family == AF_BTH) {
     if (sock_addr_len < static_cast<socklen_t>(sizeof(SOCKADDR_BTH)))
       return false;
     const SOCKADDR_BTH* addr =
         reinterpret_cast<const SOCKADDR_BTH*>(sock_addr);
     *address = reinterpret_cast<const uint8*>(&addr->btAddr);
     *address_len = kBluetoothAddressSize;
     if (port)
-      *port = addr->port;
+      *port = static_cast<uint16>(addr->port);
     return true;
   }
 #endif
 
   return false;  // Unrecognized |sa_family|.
 }
 
 std::string IPAddressToString(const uint8* address,
                               size_t address_len) {
   std::string str;
@@ skipping 470 matching lines @@
 
 unsigned MaskPrefixLength(const IPAddressNumber& mask) {
   IPAddressNumber all_ones(mask.size(), 0xFF);
   return CommonPrefixLength(mask, all_ones);
 }
 
 ScopedWifiOptions::~ScopedWifiOptions() {
 }
 
 }  // namespace net