Fixes a crash if you put chrome in a very short directory

- like c:\bang.
- it will crash at startup on a bad iterator use.

BUG=4112

Review URL: http://codereview.chromium.org/9610

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4854 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 9 deletions

diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
index bec4af8..188b653 100644
--- a/chrome/installer/util/install_util.cc
+++ b/chrome/installer/util/install_util.cc
@@ -114,20 +114,13 @@ void InstallUtil::WriteInstallerResult(bool system_install,
 }
 
 bool InstallUtil::IsPerUserInstall(const wchar_t* const exe_path) {
-  std::wstring exe_path_copy = exe_path;
 
   wchar_t program_files_path[MAX_PATH] = {0};
   if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES, NULL,
                                 SHGFP_TYPE_CURRENT, program_files_path))) {
-    std::wstring program_files_path_copy = program_files_path;
-
-    if (std::equal(program_files_path_copy.begin(),
-                   program_files_path_copy.end(), exe_path_copy.begin(),
-                   CaseInsensitiveCompare<wchar_t>())) {
-      return false;
-    }
+    return !StartsWith(exe_path, program_files_path, false);
   } else {
     NOTREACHED();
   }
   return true;
-}
\ No newline at end of file
+}