commit 7798501d7a20129d45889aac6854f00a55f20445
author zhihuang <zhihuang@webrtc.org> Tue Feb 07 23:45:16 2017
committer Commit bot <commit-bot@chromium.org> Tue Feb 07 23:45:16 2017
tree 0a52bb430c9a7764049096266c6af59505e7df39
parent 9dd77baca440ed3053eeca5f84ec2e4810401d9f

Fix the Chrome crash caused by RtcEventLog

Stop the RtcEventLog when the PeerConnection is closed so that Chrome
will not crash because of creating too many threads.

BUG=chromium:687553

Review-Url: https://codereview.webrtc.org/2682433005
Cr-Commit-Position: refs/heads/master@{#16482}

webrtc/pc/peerconnection.cc

diff --git a/webrtc/pc/peerconnection.cc b/webrtc/pc/peerconnection.cc
index ee04d8e..96e2b33 100644
--- a/webrtc/pc/peerconnection.cc
+++ b/webrtc/pc/peerconnection.cc
@@ -1558,6 +1558,7 @@
   stats_->UpdateStats(kStatsOutputLevelStandard);
 
   session_->Close();
+  event_log_.reset();
 }
 
 void PeerConnection::OnSessionStateChange(WebRtcSession* /*session*/,
@@ -2573,10 +2574,15 @@
 
 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file,
                                         int64_t max_size_bytes) {
+  if (!event_log_) {
+    return false;
+  }
   return event_log_->StartLogging(file, max_size_bytes);
 }
 
 void PeerConnection::StopRtcEventLog_w() {
-  event_log_->StopLogging();
+  if (event_log_) {
+    event_log_->StopLogging();
+  }
 }
 }  // namespace webrtc