Change extension id format back to mp-decimal, and change the

chrome/browser/extensions/extensions_service.cc

 // Copyright (c) 2009 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/extensions_service.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/crypto/signature_verifier.h"
 #include "base/file_util.h"
@@ skipping 422 matching lines @@
 void ExtensionsService::GetExternalExtensions(
     DictionaryValue* external_extensions,
     std::set<std::string>* killed_extensions) {
   const DictionaryValue* dict = prefs_->GetDictionary(kExternalExtensionsPref);
   if (!dict || dict->GetSize() == 0)
     return;
 
   for (DictionaryValue::key_iterator i = dict->begin_keys();
        i != dict->end_keys(); ++i) {
     std::wstring key_name = *i;
-    DCHECK(Extension::IdIsValid(WideToASCII(key_name)));
+    if (!Extension::IdIsValid(WideToASCII(key_name))) {
+      LOG(WARNING) << "Invalid external extension ID encountered: "
+                   << WideToASCII(key_name);
+      continue;
+    }
+
     DictionaryValue* extension = NULL;
     if (!dict->GetDictionary(key_name, &extension)) {
       NOTREACHED();
       continue;
     }
 
     // Check to see if the extension has been killed.
     int state;
     if (extension->GetInteger(kState, &state) &&
         state == static_cast<int>(Extension::KILLBIT)) {
@@ skipping 113 matching lines @@
   // Find all child directories in the install directory and load their
   // manifests. Post errors and results to the frontend.
   file_util::FileEnumerator enumerator(install_directory_,
                                        false,  // Not recursive.
                                        file_util::FileEnumerator::DIRECTORIES);
   FilePath extension_path;
   for (extension_path = enumerator.Next(); !extension_path.value().empty();
        extension_path = enumerator.Next()) {
     std::string extension_id = WideToASCII(
         extension_path.BaseName().ToWStringHack());
+
     // The utility process might be in the middle of unpacking an extension, so
     // ignore the temp unpacking directory.
     if (extension_id == kUnpackExtensionDir)
       continue;
 
+    // Ignore directories that aren't valid IDs.
+    if (!Extension::IdIsValid(extension_id)) {
+      LOG(WARNING) << "Invalid extension ID encountered in extensions "
+                      "directory: " << extension_id;
+      continue;
+    }
+
     // If there is no Current Version file, just delete the directory and move
     // on. This can legitimately happen when an uninstall does not complete, for
     // example, when a plugin is in use at uninstall time.
     FilePath current_version_path = extension_path.AppendASCII(
         ExtensionsService::kCurrentVersionFileName);
     if (!file_util::PathExists(current_version_path)) {
       LOG(INFO) << "Deleting incomplete install for directory "
                 << WideToASCII(extension_path.ToWStringHack()) << ".";
       file_util::Delete(extension_path, true);  // Recursive.
       continue;
@@ skipping 786 matching lines @@
   Extension::InstallType install_type =
       CompareToInstalledVersion(id, version->GetString(), &current_version);
 
   if (install_type == Extension::DOWNGRADE)
     return false;
 
   return (install_type == Extension::UPGRADE ||
           install_type == Extension::NEW_INSTALL ||
           NeedsReinstall(id, current_version));
 }