Enable non-sequential entries when loading registry lists.

components/policy/core/common/registry_dict_win.cc

 // Copyright 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 "components/policy/core/common/registry_dict_win.h"
 
 #include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_byteorder.h"
 #include "base/values.h"
 #include "base/win/registry.h"
 #include "components/policy/core/common/schema.h"
 
 using base::win::RegistryKeyIterator;
 using base::win::RegistryValueIterator;
 
 namespace policy {
 
 namespace {
 
+// Validates that a key is numerical. Used for lists below.
+bool IsKeyNumerical(const std::string& key) {
+  int temp = 0;
+  return base::StringToInt(key, &temp);
+}
+
 // Converts a value (as read from the registry) to meet |schema|, converting
 // types as necessary. Unconvertible types will show up as null values in the
 // result.
 std::unique_ptr<base::Value> ConvertValue(const base::Value& value,
                                           const Schema& schema) {
   if (!schema.valid())
     return value.CreateDeepCopy();
 
   // If the type is good already, go with it.
   if (value.IsType(schema.type())) {
@@ skipping 56 matching lines @@
       double double_value = 0;
       if (value.GetAsDouble(&double_value) ||
           (value.GetAsString(&string_value) &&
            base::StringToDouble(string_value, &double_value))) {
         return std::unique_ptr<base::Value>(
             new base::FundamentalValue(double_value));
       }
       break;
     }
     case base::Value::TYPE_LIST: {
-      // Lists are encoded as subkeys with numbered value in the registry.
+      // Lists are encoded as subkeys with numbered value in the registry
+      // (non-numerical keys are ignored).
       const base::DictionaryValue* dict = nullptr;
       if (value.GetAsDictionary(&dict)) {
         std::unique_ptr<base::ListValue> result(new base::ListValue());
-        for (int i = 1; ; ++i) {
-          const base::Value* entry = nullptr;
-          if (!dict->Get(base::IntToString(i), &entry))
-            break;
+        for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd();
+             it.Advance()) {
+          if (!IsKeyNumerical(it.key()))
+            continue;
           std::unique_ptr<base::Value> converted =
-              ConvertValue(*entry, schema.GetItems());
+              ConvertValue(it.value(), schema.GetItems());
           if (converted)
             result->Append(converted.release());
         }
         return std::move(result);
       }
       // Fall through in order to accept lists encoded as JSON strings.
     }
     case base::Value::TYPE_DICTIONARY: {
       // Dictionaries may be encoded as JSON strings.
       if (value.GetAsString(&string_value)) {
@@ skipping 193 matching lines @@
         std::unique_ptr<base::Value> converted =
             entry->second->ConvertToJSON(subschema);
         if (converted)
           result->SetWithoutPathExpansion(entry->first, converted.release());
       }
       return std::move(result);
     }
     case base::Value::TYPE_LIST: {
       std::unique_ptr<base::ListValue> result(new base::ListValue());
       Schema item_schema = schema.valid() ? schema.GetItems() : Schema();
-      for (int i = 1; ; ++i) {
-        const std::string name(base::IntToString(i));
-        const RegistryDict* key = GetKey(name);
-        if (key) {
-          std::unique_ptr<base::Value> converted =
-              key->ConvertToJSON(item_schema);
-          if (converted)
-            result->Append(converted.release());
+      for (RegistryDict::KeyMap::const_iterator entry(keys_.begin());
+           entry != keys_.end(); ++entry) {
+        if (!IsKeyNumerical(entry->first))
           continue;
-        }
-        const base::Value* value = GetValue(name);
-        if (value) {
-          std::unique_ptr<base::Value> converted =
-              ConvertValue(*value, item_schema);
-          if (converted)
-            result->Append(converted.release());
+        std::unique_ptr<base::Value> converted =
+            entry->second->ConvertToJSON(item_schema);
+        if (converted)
+          result->Append(converted.release());
+      }
+      for (RegistryDict::ValueMap::const_iterator entry(values_.begin());
+           entry != values_.end(); ++entry) {
+        if (!IsKeyNumerical(entry->first))
           continue;
-        }
-        break;
+        std::unique_ptr<base::Value> converted =
+            ConvertValue(*entry->second, item_schema);
+        if (converted)
+          result->Append(converted.release());
       }
       return std::move(result);
     }
     default:
       LOG(WARNING) << "Can't convert registry key to schema type " << type;
   }
 
   return nullptr;
 }
 
 }  // namespace policy