autoland: changeset 318758:c0c023815311c2632a9763b696492342b0e829e1

☠☠ backed out by f5feb30dd175 ☠ ☠
author	Andreas Pehrson <pehrsons@gmail.com>
	Mon, 29 Aug 2016 16:34:27 +0200
changeset 318758	c0c023815311c2632a9763b696492342b0e829e1
parent 318757	443a94083e005ad58574d3571be3299ffc6d8029
child 318759	75faf4827dcf906c0e6573affa6ce1689fd79ea8
push id	33357
push user	cbook@mozilla.com
push date	Thu, 20 Oct 2016 15:28:23 +0000
treeherder	autoland@24f14dccbbd2 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jib
bugs	1294605
milestone	52.0a1
first release with	nightly linux32 f0f1aaf051d6 / 52.0a1 / 20161021030210 / files nightly linux64 f0f1aaf051d6 / 52.0a1 / 20161021030210 / files nightly mac f0f1aaf051d6 / 52.0a1 / 20161021030210 / files nightly win32 f0f1aaf051d6 / 52.0a1 / 20161021030210 / files nightly win64 f0f1aaf051d6 / 52.0a1 / 20161021030210 / files
last release without	nightly linux32 99a239e1866a / 52.0a1 / 20161020030211 / files nightly linux64 99a239e1866a / 52.0a1 / 20161020030211 / files nightly mac 99a239e1866a / 52.0a1 / 20161020030211 / files nightly win32 99a239e1866a / 52.0a1 / 20161020030211 / files nightly win64 99a239e1866a / 52.0a1 / 20161020030211 / files

--- a/dom/media/MediaStreamTrack.cpp
+++ b/dom/media/MediaStreamTrack.cpp
@@ -409,16 +409,23 @@ MediaStreamTrack::NotifyEnded()
   MOZ_ASSERT(NS_IsMainThread());
 
   if (Ended()) {
     return;
   }
 
   LOG(LogLevel::Info, ("MediaStreamTrack %p ended", this));
 
+  if (!mSource) {
+    MOZ_ASSERT(false);
+    return;
+  }
+
+  mSource->UnregisterSink(this);
+
   mReadyState = MediaStreamTrackState::Ended;
 
   DispatchTrustedEvent(NS_LITERAL_STRING("ended"));
 }
 
 DOMMediaStream*
 MediaStreamTrack::GetInputDOMStream()
 {