From d644feb81fe1bfbf6642469319b31b3944697631 Mon Sep 17 00:00:00 2001
From: Anton Sukhanov <sukhanov@webrtc.org>
Date: Thu, 6 Dec 2018 09:00:39 -0800
Subject: [PATCH] Make sure media transport is deleted before ICE.

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}
---
 pc/jseptransport.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pc/jseptransport.cc b/pc/jseptransport.cc
index 28389d562e..eddbbce5e1 100644
--- a/pc/jseptransport.cc
+++ b/pc/jseptransport.cc
@@ -135,6 +135,9 @@ JsepTransport::JsepTransport(
 JsepTransport::~JsepTransport() {
   if (media_transport_) {
     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
   // other places, so we can't assume they'll be deleted by the destructor.