Improve validation of external extension ids.

chrome/browser/extensions/external_registry_extension_loader_win.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 "chrome/browser/extensions/external_registry_extension_loader_win.h"
 
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 39 matching lines @@
     key_path.append(L"\\");
     key_path.append(iterator.Name());
     if (key.Open(kRegRoot, key_path.c_str(), KEY_READ)) {
       std::wstring extension_path;
       if (key.ReadValue(kRegistryExtensionPath, &extension_path)) {
         std::wstring extension_version;
         if (key.ReadValue(kRegistryExtensionVersion, &extension_version)) {
           std::string id = WideToASCII(iterator.Name());
           StringToLowerASCII(&id);
 
+          if (!Extension::IdIsValid(id)) {
+            LOG(ERROR) << "Invalid id value " << id
+                       << " for key " << key_path << " .";
+            ++iterator;
+            continue;
+          }
+
+          scoped_ptr<Version> version;
+          version.reset(Version::GetVersionFromString(
+                            WideToASCII(extension_version)));
+          if (!version.get()) {
+            LOG(ERROR) << "Invalid version value " << extension_version
+                       << " for key " << key_path << " .";
+            ++iterator;
+            continue;
+          }
+
           prefs->SetString(
               id + "." + ExternalExtensionProviderImpl::kExternalVersion,
               WideToASCII(extension_version));
           prefs->SetString(
               id + "." + ExternalExtensionProviderImpl::kExternalCrx,
               extension_path);
         } else {
           // TODO(erikkay): find a way to get this into about:extensions
           LOG(ERROR) << "Missing value " << kRegistryExtensionVersion
-                     << " for key " << key_path;
+                     << " for key " << key_path << " .";
         }
       } else {
         // TODO(erikkay): find a way to get this into about:extensions
         LOG(ERROR) << "Missing value " << kRegistryExtensionPath
-                   << " for key " << key_path;
+                   << " for key " << key_path << " .";
       }
     }
     ++iterator;
   }
 
   prefs_.reset(prefs.release());
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this,
           &ExternalRegistryExtensionLoader::LoadFinished));
 }