Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: components/domain_reliability/config.cc

Issue 945923002: Fix memory leak and crash when parsing baked-in configs in domain reliability monitor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/domain_reliability/monitor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/domain_reliability/config.cc
diff --git a/components/domain_reliability/config.cc b/components/domain_reliability/config.cc
index 0898ff300c8485feda55f7f09907801958652de2..612f0bd596cbf5601a5a373740afeb44ee96faff 100644
--- a/components/domain_reliability/config.cc
+++ b/components/domain_reliability/config.cc
@@ -94,13 +94,12 @@ scoped_ptr<const DomainReliabilityConfig> DomainReliabilityConfig::FromJSON(
const base::StringPiece& json) {
scoped_ptr<base::Value> value(base::JSONReader::Read(json));
base::JSONValueConverter<DomainReliabilityConfig> converter;
- DomainReliabilityConfig* config = new DomainReliabilityConfig();
+ scoped_ptr<DomainReliabilityConfig> config(new DomainReliabilityConfig());
// If we can parse and convert the JSON into a valid config, return that.
- if (value && converter.Convert(*value, config) && config->IsValid())
- return scoped_ptr<const DomainReliabilityConfig>(config);
- else
- return scoped_ptr<const DomainReliabilityConfig>();
+ if (value && converter.Convert(*value, config.get()) && config->IsValid())
+ return config.Pass();
+ return scoped_ptr<const DomainReliabilityConfig>();
}
bool DomainReliabilityConfig::IsValid() const {
« no previous file with comments | « no previous file | components/domain_reliability/monitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698