bluetooth: Require valid UUIDs when testing against Web Bluetooth Blacklist.

content/browser/bluetooth/bluetooth_blacklist.cc

 // Copyright 2016 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 "content/browser/bluetooth/bluetooth_blacklist.h"
 
 #include "base/logging.h"
 #include "content/common/bluetooth/bluetooth_scan_filter.h"
 
 using device::BluetoothUUID;
@@ skipping 14 matching lines @@
   return g_singleton.Get();
 }
 
 void BluetoothBlacklist::AddOrDie(const device::BluetoothUUID& uuid,
                                   Value value) {
   auto insert_result = blacklisted_uuids_.insert(std::make_pair(uuid, value));
   CHECK(insert_result.second);
 }
 
 bool BluetoothBlacklist::IsExcluded(const BluetoothUUID& uuid) const {
+  CHECK(uuid.IsValid());
   const auto& it = blacklisted_uuids_.find(uuid);
   if (it == blacklisted_uuids_.end())
     return false;
   return it->second == Value::EXCLUDE;
 }
 
 bool BluetoothBlacklist::IsExcluded(
     const std::vector<content::BluetoothScanFilter>& filters) {
   for (const BluetoothScanFilter& filter : filters) {
     for (const BluetoothUUID& service : filter.services) {
       if (IsExcluded(service)) {
         return true;
       }
     }
   }
   return false;
 }
 
 bool BluetoothBlacklist::IsExcludedFromReads(const BluetoothUUID& uuid) const {
+  CHECK(uuid.IsValid());

[ortuno, 2016/02/19 20:54:51]

Why not check that added UUIDs are valid as well?

[scheib, 2016/02/22 20:27:12]

Done.

   const auto& it = blacklisted_uuids_.find(uuid);
   if (it == blacklisted_uuids_.end())
     return false;
   return it->second == Value::EXCLUDE || it->second == Value::EXCLUDE_READS;
 }
 
 bool BluetoothBlacklist::IsExcludedFromWrites(const BluetoothUUID& uuid) const {
+  CHECK(uuid.IsValid());
   const auto& it = blacklisted_uuids_.find(uuid);
   if (it == blacklisted_uuids_.end())
     return false;
   return it->second == Value::EXCLUDE || it->second == Value::EXCLUDE_WRITES;
 }
 
 void BluetoothBlacklist::RemoveExcludedUuids(
     std::vector<device::BluetoothUUID>* uuids) {
   auto it = uuids->begin();
   while (it != uuids->end()) {
@@ skipping 27 matching lines @@
   // ## Characteristics
   AddOrDie(BluetoothUUID("2a02"), Value::EXCLUDE_WRITES);
   AddOrDie(BluetoothUUID("2a03"), Value::EXCLUDE);
   AddOrDie(BluetoothUUID("2a25"), Value::EXCLUDE);
   // ## Descriptors
   AddOrDie(BluetoothUUID("2902"), Value::EXCLUDE_WRITES);
   AddOrDie(BluetoothUUID("2903"), Value::EXCLUDE_WRITES);
 }
 
 }  // namespace content