Bug 1426678 - Ensure SendTrack is not null before trying to dispatch DTMF event; r?bwc draft
authorDan Minor <dminor@mozilla.com>
Thu, 21 Dec 2017 11:41:41 -0500
changeset 714052 3c34cab01212e0bb002fcc5e0c55e44bb45957a2
parent 713998 5b1fdaa14d35ddf1a638c9422786ede707cacf1f
child 744502 e0b79a90d638c8dcd6921b2bd27109dfad5905d2
push id93828
push userbmo:dminor@mozilla.com
push dateThu, 21 Dec 2017 16:44:53 +0000
reviewersbwc
bugs1426678
milestone59.0a1
Bug 1426678 - Ensure SendTrack is not null before trying to dispatch DTMF event; r?bwc MozReview-Commit-ID: CZbvPlIceXB
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -3825,18 +3825,24 @@ PeerConnectionImpl::DTMFState::Notify(ns
   }
 
   RefPtr<PeerConnectionObserver> pco = do_QueryObjectReferent(mPCObserver);
   if (!pco) {
     NS_WARNING("Failed to dispatch the RTCDTMFToneChange event!");
     return NS_OK; // Return is ignored anyhow
   }
 
+  RefPtr<dom::MediaStreamTrack> sendTrack = mTransceiver->GetSendTrack();
+  if (!sendTrack) {
+    NS_WARNING("Failed to dispatch the RTCDTMFToneChange event!");
+    return NS_OK; // Return is ignored anyhow
+  }
+
   JSErrorResult jrv;
-  pco->OnDTMFToneChange(*mTransceiver->GetSendTrack(), eventTone, jrv);
+  pco->OnDTMFToneChange(*sendTrack, eventTone, jrv);
 
   if (jrv.Failed()) {
     NS_WARNING("Failed to dispatch the RTCDTMFToneChange event!");
   }
 
   return NS_OK;
 }