Bug 1259985 - Add missing return after null-check - r?jya draft
authorGerald Squelart <gsquelart@mozilla.com>
Sun, 27 Mar 2016 19:57:25 +1100
changeset 345002 1d027b0d437a8b4a9f329c27a07900a4a1f67ac4
parent 344995 63be002b4a803df1122823841ef7633b7561d873
child 517107 bfbf70060b2fbda28e7cecb507b1dbb24c8dc050
push id13991
push usergsquelart@mozilla.com
push dateSun, 27 Mar 2016 08:57:53 +0000
reviewersjya
bugs1259985
milestone48.0a1
Bug 1259985 - Add missing return after null-check - r?jya MozReview-Commit-ID: 138NM9xTmVA
dom/media/mediasource/TrackBuffersManager.cpp
--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -886,16 +886,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);