diff options
| author | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 23:24:43 +0000 |
|---|---|---|
| committer | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 23:24:43 +0000 |
| commit | ed2b7ac891ff693a0fef780806035ae01ccfee06 (patch) | |
| tree | c3ecc7bdef02cf3f89244477f7bf0962e65a1632 | |
| parent | 7439d6effb6af59da1ea990b5a9d6ce6e9253458 (diff) | |
| download | chromium_src-ed2b7ac891ff693a0fef780806035ae01ccfee06.zip chromium_src-ed2b7ac891ff693a0fef780806035ae01ccfee06.tar.gz chromium_src-ed2b7ac891ff693a0fef780806035ae01ccfee06.tar.bz2 | |
Merge 50153 - Speculative workaround for a crash. Not sure how it could reach this state, but testing to see if this is the cause of the crash.
BUG=46833
Review URL: http://codereview.chromium.org/2841010
TBR=eroman@chromium.org
Review URL: http://codereview.chromium.org/2799014
git-svn-id: svn://svn.chromium.org/chrome/branches/437/src@50164 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/net/passive_log_collector.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/net/passive_log_collector.cc b/chrome/browser/net/passive_log_collector.cc index c1e6c9b..12b57b8 100644 --- a/chrome/browser/net/passive_log_collector.cc +++ b/chrome/browser/net/passive_log_collector.cc @@ -177,7 +177,12 @@ void PassiveLogCollector::SourceTracker::OnAddEntry(const Entry& entry) { void PassiveLogCollector::SourceTracker::DeleteSourceInfo( uint32 source_id) { SourceIDToInfoMap::iterator it = sources_.find(source_id); - DCHECK(it != sources_.end()); + if (it == sources_.end()) { + // TODO(eroman): Is this happening? And if so, why. Remove this + // once the cause is understood. + LOG(WARNING) << "Tried to delete info for nonexistent source"; + return; + } // The source should not be in the deletion queue. DCHECK(std::find(deletion_queue_.begin(), deletion_queue_.end(), source_id) == deletion_queue_.end()); |