Bug 1259985 - Add missing return after null-check - r=jya a=lizzard
authorGerald Squelart <gsquelart@mozilla.com>
Sun, 27 Mar 2016 19:57:25 +1100
changeset 323692 f0bcd999646ef34545e9c48d206ea8504b468d8c
parent 323691 c310d32547b3165c09d21d49cf8c4b76c55aa77f
child 323693 9b97e56d0ff2a6363fa741832ed1092f72fd39f1
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya, lizzard
bugs1259985
milestone47.0a2
Bug 1259985 - Add missing return after null-check - r=jya a=lizzard MozReview-Commit-ID: 138NM9xTmVA
dom/media/mediasource/TrackBuffersManager.cpp
--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -872,16 +872,17 @@ TrackBuffersManager::OnDemuxerInitDone(n
   MOZ_ASSERT(OnTaskQueue());
   mDemuxerInitRequest.Complete();
 
   if (!mInputDemuxer) {
     // mInputDemuxer shouldn't have been destroyed while a demuxer init/reset
     // request was being processed. See bug 1239983.
     NS_ASSERTION(false, "mInputDemuxer has been destroyed");
     RejectAppend(NS_ERROR_ABORT, __func__);
+    return;
   }
 
   MediaInfo info;
 
   uint32_t numVideos = mInputDemuxer->GetNumberTracks(TrackInfo::kVideoTrack);
   if (numVideos) {
     // We currently only handle the first video track.
     mVideoTracks.mDemuxer = mInputDemuxer->GetTrackDemuxer(TrackInfo::kVideoTrack, 0);