diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 14:26:45 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 14:26:45 +0000 |
| commit | 27861447e9b9f359cf893065ef07186589791333 (patch) | |
| tree | 8da0465b8df55443f900ec2ccfd65338d78cff9c /chrome/browser/content_settings | |
| parent | 4b522bdf185cec1e4cea6a657de2c8142df779a8 (diff) | |
| download | chromium_src-27861447e9b9f359cf893065ef07186589791333.zip chromium_src-27861447e9b9f359cf893065ef07186589791333.tar.gz chromium_src-27861447e9b9f359cf893065ef07186589791333.tar.bz2 | |
Fix DCHECK() hit when synching a new profile
BUG=89270
TEST=Verified that synching a new profile didn't hit the DCHECK
Review URL: http://codereview.chromium.org/7362009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings')
| -rw-r--r-- | chrome/browser/content_settings/content_settings_pref_provider.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc index af92515a..2658887 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc @@ -971,6 +971,8 @@ void PrefProvider::MigrateObsoleteContentSettingsPatternPref() { i != all_settings_dictionary->end_keys(); ++i) { const std::string& key(*i); + if (key.empty()) + continue; // Validate pattern string and skip it if it is invalid. std::pair<ContentSettingsPattern, ContentSettingsPattern> pattern_pair = |