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

Unified Diff: components/domain_reliability/monitor.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 | « components/domain_reliability/monitor.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/domain_reliability/monitor.cc
diff --git a/components/domain_reliability/monitor.cc b/components/domain_reliability/monitor.cc
index ef9bc75f23d8239b59cca1db39360fd08169d883..070b62deb09271eb0d35c3432887400ad8e80a0a 100644
--- a/components/domain_reliability/monitor.cc
+++ b/components/domain_reliability/monitor.cc
@@ -21,8 +21,8 @@ namespace domain_reliability {
DomainReliabilityMonitor::DomainReliabilityMonitor(
const std::string& upload_reporter_string,
- scoped_refptr<base::SingleThreadTaskRunner> pref_thread,
- scoped_refptr<base::SingleThreadTaskRunner> network_thread)
+ const scoped_refptr<base::SingleThreadTaskRunner>& pref_thread,
+ const scoped_refptr<base::SingleThreadTaskRunner>& network_thread)
: time_(new ActualTime()),
upload_reporter_string_(upload_reporter_string),
scheduler_params_(
@@ -39,8 +39,8 @@ DomainReliabilityMonitor::DomainReliabilityMonitor(
DomainReliabilityMonitor::DomainReliabilityMonitor(
const std::string& upload_reporter_string,
- scoped_refptr<base::SingleThreadTaskRunner> pref_thread,
- scoped_refptr<base::SingleThreadTaskRunner> network_thread,
+ const scoped_refptr<base::SingleThreadTaskRunner>& pref_thread,
+ const scoped_refptr<base::SingleThreadTaskRunner>& network_thread,
scoped_ptr<MockableTime> time)
: time_(time.Pass()),
upload_reporter_string_(upload_reporter_string),
@@ -90,7 +90,8 @@ void DomainReliabilityMonitor::InitURLRequestContext(
}
void DomainReliabilityMonitor::InitURLRequestContext(
- scoped_refptr<net::URLRequestContextGetter> url_request_context_getter) {
+ const scoped_refptr<net::URLRequestContextGetter>&
+ url_request_context_getter) {
DCHECK(OnNetworkThread());
DCHECK(moved_to_network_thread_);
@@ -114,10 +115,12 @@ void DomainReliabilityMonitor::AddBakedInConfigs() {
base::Time now = base::Time::Now();
for (size_t i = 0; kBakedInJsonConfigs[i]; ++i) {
- std::string json(kBakedInJsonConfigs[i]);
+ base::StringPiece json(kBakedInJsonConfigs[i]);
scoped_ptr<const DomainReliabilityConfig> config =
DomainReliabilityConfig::FromJSON(json);
- if (config && config->IsExpired(now)) {
+ if (!config) {
+ continue;
+ } else if (config->IsExpired(now)) {
LOG(WARNING) << "Baked-in Domain Reliability config for "
<< config->domain << " is expired.";
continue;
« no previous file with comments | « components/domain_reliability/monitor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698