net: handle trailing dots in LastTwoLabels.

net/base/ssl_false_start_blacklist_process.cc

 // Copyright (c) 2011 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.
 
 // This utility program exists to process the False Start blacklist file into
 // a static hash table so that it can be efficiently queried by Chrome.
 
 #include <stdio.h>
 #include <stdlib.h>
 
@@ skipping 95 matching lines @@
 
 // CheckLengths returns true iff every host is less than 256 bytes long (not
 // including the terminating NUL) and contains two or more labels.
 static bool CheckLengths(const std::vector<std::string>& hosts) {
   for (std::vector<std::string>::const_iterator
        i = hosts.begin(); i != hosts.end(); i++) {
      if (i->size() >= 256) {
        fprintf(stderr, "Entry %s is too large\n", i->c_str());
        return false;
      }
-     if (SSLFalseStartBlacklist::LastTwoLabels(i->c_str()) == NULL) {
+     if (SSLFalseStartBlacklist::LastTwoLabels(i->c_str()).empty()) {
        fprintf(stderr, "Entry %s contains too few labels\n", i->c_str());
        return false;
      }
   }
 
   return true;
 }
 
 int main(int argc, char** argv) {
   if (argc != 3)
@@ skipping 73 matching lines @@
     fprintf(stderr, "One or more entries is too large or too small\n");
     return 2;
   }
 
   fprintf(stderr, "Using %d entry hash table\n", kBuckets);
   uint32 table[kBuckets];
   std::vector<std::string> buckets[kBuckets];
 
   for (std::vector<std::string>::const_iterator
        i = hosts.begin(); i != hosts.end(); i++) {
-    const char* last_two_labels =
+    const std::string last_two_labels =
         SSLFalseStartBlacklist::LastTwoLabels(i->c_str());
-    const unsigned h = SSLFalseStartBlacklist::Hash(last_two_labels);
+    const unsigned h = SSLFalseStartBlacklist::Hash(last_two_labels.c_str());
     buckets[h & (kBuckets - 1)].push_back(*i);
   }
 
   std::string table_data;
   unsigned max_bucket_size = 0;
   for (unsigned i = 0; i < kBuckets; i++) {
     if (buckets[i].size() > max_bucket_size)
       max_bucket_size = buckets[i].size();
 
     table[i] = table_data.size();
@@ skipping 39 matching lines @@
     } else if (line_length >= 70) {
       fprintf(out, "\n");
       line_length = 0;
     }
   }
   fprintf(out, "\n}  // namespace net\n");
   fclose(out);
 
   return 0;
 }