Update code that previously constructed strings from string iterators only to...

net/base/net_util.cc

 // Copyright (c) 2010 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 <algorithm>
 #include <map>
 #include <unicode/regex.h>
 #include <unicode/ucnv.h>
@@ skipping 1658 matching lines @@
   // The comma delimiter.
   const std::string::value_type kComma = ',';
 
   // Overflow is still possible for evil user inputs.
   for (size_t i = 0; i <= size; ++i) {
     // The string should be composed of only digits and commas.
     if (i != size && !IsAsciiDigit(allowed_ports[i]) &&
         (allowed_ports[i] != kComma))
       return;
     if (i == size || allowed_ports[i] == kComma) {
-      size_t length = i - last;
-      if (length > 0) {
+      if (i > last) {
         int port;
-        base::StringToInt(allowed_ports.substr(last, length), &port);
+        base::StringToInt(allowed_ports.begin() + last,
+                          allowed_ports.begin() + i,
+                          &port);
         ports.insert(port);
       }
       last = i + 1;
     }
   }
   explicitly_allowed_ports = ports;
 }
 
 enum IPv6SupportStatus {
   IPV6_CANNOT_CREATE_SOCKETS,
@@ skipping 296 matching lines @@
 }
 
 int GetPortFromAddrinfo(const struct addrinfo* info) {
   uint16* port_field = GetPortFieldFromAddrinfo(info);
   if (!port_field)
     return -1;
   return ntohs(*port_field);
 }
 
 }  // namespace net