zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure media transport is deleted before ICE.

Browse Source 
This was regression due to
https://webrtc-review.googlesource.com/c/src/+/111920

which broke downstream projects. The break was not caught in
unit tests, because unit tests use loopback and fake media
transports that do not use ICE.

Bug: None
Change-Id: If95935afed430d62d5ff9a2ee01d8eaccadc198d
Reviewed-on: https://webrtc-review.googlesource.com/c/113440
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Peter Slatala <psla@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25926}
This commit is contained in:
Anton Sukhanov
2018-12-06 09:00:39 -08:00
committed by Commit Bot
parent f73d40feca
commit d644feb81f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pc/jseptransport.cc
View File

@ -135,6 +135,9 @@ JsepTransport::JsepTransport(
JsepTransport::~JsepTransport() { JsepTransport::~JsepTransport() {
if (media_transport_) { if (media_transport_) {
media_transport_->SetMediaTransportStateCallback(nullptr); media_transport_->SetMediaTransportStateCallback(nullptr);
// Make sure we delete media transport before ICE.
media_transport_.reset();
} }
// Clear all DtlsTransports. There may be pointers to these from // Clear all DtlsTransports. There may be pointers to these from
// other places, so we can't assume they'll be deleted by the destructor. // other places, so we can't assume they'll be deleted by the destructor.