diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-15 20:43:38 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-15 20:43:38 +0000 |
| commit | 7f858d1032720f471991db19c383e1af19c24088 (patch) | |
| tree | f63fd7d0afc914548c2c2e21afbab7ddc69ba106 /chrome | |
| parent | f409f566b898a7b10e1baceecbcaa26cfd0b17f3 (diff) | |
| download | chromium_src-7f858d1032720f471991db19c383e1af19c24088.zip chromium_src-7f858d1032720f471991db19c383e1af19c24088.tar.gz chromium_src-7f858d1032720f471991db19c383e1af19c24088.tar.bz2 | |
Fix crash in setup.exe.
The change in uninstall.cc is unrelated and is meant to fix a typo from
http://codereview.chromium.org/63116
BUG=10507
Review URL: http://codereview.chromium.org/75006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/installer/setup/uninstall.cc | 2 | ||||
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc index 05b7f63..04907e5 100644 --- a/chrome/installer/setup/uninstall.cc +++ b/chrome/installer/setup/uninstall.cc @@ -253,7 +253,7 @@ installer_util::InstallStatus installer_setup::UninstallChrome( file_util::AppendToPath(&ext_prog_id, ShellUtil::kChromeExtProgId); DeleteRegistryKey(key, ext_prog_id); std::wstring ext_association(ShellUtil::kRegClasses); - ext_association.append(L"."); + ext_association.append(L"\\."); ext_association.append(chrome::kExtensionFileExtension); DeleteRegistryKey(key, ext_association); diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 920ea47..278a6e7 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -69,6 +69,8 @@ bool GoogleChromeDistribution::ExtractUninstallMetricsFromFile( std::string json_error_string; scoped_ptr<Value> root(json_serializer.Deserialize(NULL)); + if (!root.get()) + return false; // Preferences should always have a dictionary root. if (!root->IsType(Value::TYPE_DICTIONARY)) |