summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_settings/host_content_settings_map.cc
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 23:21:58 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 23:21:58 +0000
commitc2632ab128e13820d4203e2973a85033df9fbd38 (patch)
tree5ef2f7773b441a31b07ed8ab0d42d27bdac6f54b /chrome/browser/content_settings/host_content_settings_map.cc
parent7b580671bdd357ba9baa56b433db39ffeceb05f2 (diff)
downloadchromium_src-c2632ab128e13820d4203e2973a85033df9fbd38.zip
chromium_src-c2632ab128e13820d4203e2973a85033df9fbd38.tar.gz
chromium_src-c2632ab128e13820d4203e2973a85033df9fbd38.tar.bz2
Valgrind: Fix a leak in ContentSettingsProvider.
If the call to SetWebsiteSetting() fails, the value is still owned by the caller and must be deleted. BUG=none TEST=none R=bauerb@chromium.org Review URL: http://codereview.chromium.org/8592001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings/host_content_settings_map.cc')
-rw-r--r--chrome/browser/content_settings/host_content_settings_map.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index db119ab..fe8fe1e 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -211,12 +211,11 @@ void HostContentSettingsMap::SetDefaultContentSetting(
DCHECK(IsSettingAllowedForType(setting, content_type));
base::Value* value = Value::CreateIntegerValue(setting);
- content_settings_providers_[DEFAULT_PROVIDER]->SetWebsiteSetting(
- ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- content_type,
- std::string(),
- value);
+ if (!content_settings_providers_[DEFAULT_PROVIDER]->SetWebsiteSetting(
+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
+ content_type, std::string(), value)) {
+ delete value;
+ }
}
void HostContentSettingsMap::SetWebsiteSetting(