Bug 1259985 - Add missing return after null-check - r=jya
authorGerald Squelart <gsquelart@mozilla.com>
Sun, 27 Mar 2016 19:57:25 +1100
changeset 290584 b6fc58671a60259a819e783c68cb97ab55592b46
parent 290583 13d8c68828cadee26f3aaca59600e103ddf8bcf9
child 290585 d26a81fecde9ef4ea756c02b4f9fcf6934a395fb
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
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);