diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-22 21:04:44 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-22 21:04:44 +0000 |
| commit | 34c0859183d62ebc334bd6cf79ec081b92fb0f4b (patch) | |
| tree | 8900068c3a80d9f04fe168b3498271949175375d /chrome/browser/content_settings/content_settings_pref_provider.cc | |
| parent | 8ede22f389d54f8b3d2472e028e5e0d4ac235d34 (diff) | |
| download | chromium_src-34c0859183d62ebc334bd6cf79ec081b92fb0f4b.zip chromium_src-34c0859183d62ebc334bd6cf79ec081b92fb0f4b.tar.gz chromium_src-34c0859183d62ebc334bd6cf79ec081b92fb0f4b.tar.bz2 | |
Coverity: Fix unchecked return values
CID=102071, 101911, 101898, 101662, 101661, 101234, 101030, 100914, 100886, 100537
BUG=none
TEST=none
TBR=johnme@chromium.org, piman@chromium.org
Review URL: http://codereview.chromium.org/9004038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings/content_settings_pref_provider.cc')
| -rw-r--r-- | chrome/browser/content_settings/content_settings_pref_provider.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc index 8a75fab..24a765e 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc @@ -607,10 +607,11 @@ void PrefProvider::UpdateObsoleteGeolocationPref( DictionaryPrefUpdate update(prefs_, prefs::kGeolocationContentSettings); DictionaryValue* obsolete_geolocation_settings = update.Get(); DictionaryValue* requesting_origin_settings_dictionary = NULL; - obsolete_geolocation_settings->GetDictionaryWithoutPathExpansion( - requesting_origin.spec(), &requesting_origin_settings_dictionary); + bool settings_found = + obsolete_geolocation_settings->GetDictionaryWithoutPathExpansion( + requesting_origin.spec(), &requesting_origin_settings_dictionary); if (setting == CONTENT_SETTING_DEFAULT) { - if (requesting_origin_settings_dictionary) { + if (settings_found) { requesting_origin_settings_dictionary->RemoveWithoutPathExpansion( embedding_origin.spec(), NULL); if (requesting_origin_settings_dictionary->empty()) { @@ -619,7 +620,7 @@ void PrefProvider::UpdateObsoleteGeolocationPref( } } } else { - if (!requesting_origin_settings_dictionary) { + if (!settings_found) { requesting_origin_settings_dictionary = new DictionaryValue; obsolete_geolocation_settings->SetWithoutPathExpansion( requesting_origin.spec(), requesting_origin_settings_dictionary); @@ -1084,8 +1085,10 @@ void PrefProvider::SyncObsoletePrefs() { DCHECK(pattern_pair.first.IsValid() && pattern_pair.second.IsValid()); DictionaryValue* settings_dictionary = NULL; - pattern_pairs_dictionary->GetDictionaryWithoutPathExpansion( - key, &settings_dictionary); + bool settings_found = + pattern_pairs_dictionary->GetDictionaryWithoutPathExpansion( + key, &settings_dictionary); + DCHECK(settings_found); int setting_value = 0; if (settings_dictionary->GetInteger( |