Commit 47ae3dfd authored by Marek Haranczyk's avatar Marek Haranczyk Committed by Commit Bot

Fix memory leak in ChooserContextBase::GetGrantedObjects.

Bug: 854329
Change-Id: Ia163d503a4207859cd41c847c9d5f67e77580fbc
Reviewed-on: https://chromium-review.googlesource.com/c/1456080Reviewed-by: default avatarBalazs Engedy <engedy@chromium.org>
Reviewed-by: default avatarRaymes Khoury <raymes@chromium.org>
Commit-Queue: Marek Haranczyk <mharanczyk@opera.com>
Cr-Commit-Position: refs/heads/master@{#629919}
parent c061c2c6
......@@ -76,9 +76,9 @@ ChooserContextBase::GetGrantedObjects(const GURL& requesting_origin,
return {};
std::vector<std::unique_ptr<Object>> results;
auto* info = new content_settings::SettingInfo();
content_settings::SettingInfo info;
std::unique_ptr<base::DictionaryValue> setting =
GetWebsiteSetting(requesting_origin, embedding_origin, info);
GetWebsiteSetting(requesting_origin, embedding_origin, &info);
std::unique_ptr<base::Value> objects;
if (!setting->Remove(kObjectListKey, &objects))
return results;
......@@ -92,7 +92,7 @@ ChooserContextBase::GetGrantedObjects(const GURL& requesting_origin,
base::DictionaryValue* object_dict;
if (object.GetAsDictionary(&object_dict) && IsValidObject(*object_dict)) {
results.push_back(std::make_unique<Object>(
requesting_origin, embedding_origin, object_dict, info->source,
requesting_origin, embedding_origin, object_dict, info.source,
host_content_settings_map_->is_incognito()));
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment