diff options
author | felt <felt@chromium.org> | 2015-07-30 18:38:24 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-31 01:38:55 +0000 |
commit | 159abd0551976b9a6c5095314c0b7696b383f753 (patch) | |
tree | ade85ef2141a5f5f9d4cb17e8897e454fbb97a87 /components/security_interstitials | |
parent | ba738a85cab386c4e96aa549f41e09064c476554 (diff) | |
download | chromium_src-159abd0551976b9a6c5095314c0b7696b383f753.zip chromium_src-159abd0551976b9a6c5095314c0b7696b383f753.tar.gz chromium_src-159abd0551976b9a6c5095314c0b7696b383f753.tar.bz2 |
Fix SSL bad clock interstitial crash
security_interstitials::MetricsHelper shouldn't try to send Rappor
reports if the Rappor report type hasn't been set, even if the caller
specified a RapporService. A crash was happening because the
MetricsHelper *was* trying to send reports with an invalid report type.
The root cause of the bug is that the constructor was setting
|rappor_service| instead of |rappor_service_|.
BUG=515564
R=estark@chromium.org
Review URL: https://codereview.chromium.org/1263133002
Cr-Commit-Position: refs/heads/master@{#341264}
Diffstat (limited to 'components/security_interstitials')
-rw-r--r-- | components/security_interstitials/metrics_helper.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/security_interstitials/metrics_helper.cc b/components/security_interstitials/metrics_helper.cc index ae2444d..b13ecfb 100644 --- a/components/security_interstitials/metrics_helper.cc +++ b/components/security_interstitials/metrics_helper.cc @@ -31,8 +31,8 @@ MetricsHelper::MetricsHelper(const GURL& request_url, num_visits_(-1) { DCHECK(!settings_.metric_prefix.empty()); if (settings_.rappor_report_type == rappor::NUM_RAPPOR_TYPES) // Default. - rappor_service = nullptr; - DCHECK(!rappor_service || !settings_.rappor_prefix.empty()); + rappor_service_ = nullptr; + DCHECK(!rappor_service_ || !settings_.rappor_prefix.empty()); if (history_service) { history_service->GetVisibleVisitCountToHost( request_url_, |