Remove unsafe registry APIs from base::win::RegKey

chrome/installer/util/shell_util.cc

 // Copyright (c) 2012 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 file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 686 matching lines @@
   base::FilePath exe_path = chrome_exe.DirName().Append(installer::kSetupExe);
 
   // Failing that, read the path to setup.exe from Chrome's ClientState key,
   // which is the canonical location of the installer for all types of installs
   // (see AddUninstallShortcutWorkItems).
   const bool is_per_user = InstallUtil::IsPerUserInstall();
   if (!base::PathExists(exe_path)) {
     RegKey key(is_per_user ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE,
                dist->GetStateKey().c_str(), KEY_QUERY_VALUE | KEY_WOW64_32KEY);
     base::string16 uninstall_string;
-    if (key.ReadValue(installer::kUninstallStringField, &uninstall_string) ==
-        ERROR_SUCCESS) {
+    if (key.Valid() && key.ReadValue(installer::kUninstallStringField,
+                                     &uninstall_string) == ERROR_SUCCESS) {
       exe_path = base::FilePath(uninstall_string);
     }
   }
 
   if (base::PathExists(exe_path)) {
     base::CommandLine cmd(exe_path);
     InstallUtil::AppendModeSwitch(&cmd);
     if (!is_per_user)
       cmd.AppendSwitch(installer::switches::kSystemLevel);
     cmd.AppendSwitchPath(installer::switches::kRegisterChromeBrowser,
@@ skipping 123 matching lines @@
   // ProgId registrations are allowed to reside in HKCU for user-level installs
   // (and values there have priority over values in HKLM). The same is true for
   // shell integration entries as of Windows 8.
   if (confirmation_level == CONFIRM_PROGID_REGISTRATION ||
       (confirmation_level == CONFIRM_SHELL_REGISTRATION &&
        base::win::GetVersion() >= base::win::VERSION_WIN8)) {
     const RegKey key_hkcu(HKEY_CURRENT_USER, reg_key.c_str(), KEY_QUERY_VALUE);
     base::string16 hkcu_value;
     // If |reg_key| is present in HKCU, assert that it points to |chrome_exe|.
     // Otherwise, fall back on an HKLM lookup below.
-    if (key_hkcu.ReadValue(L"", &hkcu_value) == ERROR_SUCCESS)
+    if (key_hkcu.Valid() &&
+        key_hkcu.ReadValue(L"", &hkcu_value) == ERROR_SUCCESS)
       return InstallUtil::ProgramCompare(chrome_exe).Evaluate(hkcu_value);
   }
 
   // Assert that |reg_key| points to |chrome_exe| in HKLM.
   const RegKey key_hklm(HKEY_LOCAL_MACHINE, reg_key.c_str(), KEY_QUERY_VALUE);
   base::string16 hklm_value;
-  if (key_hklm.ReadValue(L"", &hklm_value) == ERROR_SUCCESS)
+  if (key_hklm.Valid() && key_hklm.ReadValue(L"", &hklm_value) == ERROR_SUCCESS)
     return InstallUtil::ProgramCompare(chrome_exe).Evaluate(hklm_value);
   return false;
 }
 
 // Sets |suffix| to a 27 character string that is specific to this user on this
 // machine (on user-level installs only).
 // To support old-style user-level installs however, |suffix| is cleared if the
 // user currently owns the non-suffixed HKLM registrations.
 // |suffix| can also be set to the user's username if the current install is
 // suffixed as per the old-style registrations.
@@ skipping 1484 matching lines @@
   for (const auto& entry : entries)
     entry->AddToWorkItemList(root, items.get());
 
   // Apply all the registry changes and if there is a problem, rollback
   if (!items->Do()) {
     items->Rollback();
     return false;
   }
   return true;
 }