Bug 1270323: P5. Prevent potential null deref. r?cpearce draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Mon, 23 May 2016 16:12:17 +1000
changeset 369998 191731f27b115e9fd89a47c9439a781ae4bea9ff
parent 369997 37e919ae75a0f3de655090df5c47bc96d1304a0a
child 370228 3dc3eb396a958483a621f723151fc06aa85c9515
push id18971
push userbmo:jyavenard@mozilla.com
push dateTue, 24 May 2016 03:18:45 +0000
reviewerscpearce
bugs1270323
milestone49.0a1
Bug 1270323: P5. Prevent potential null deref. r?cpearce This currently can't happen as no MediaDataDecoder ever return a null sample. MozReview-Commit-ID: BucIadubght
dom/media/MediaFormatReader.cpp
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -1354,26 +1354,26 @@ MediaFormatReader::ResetDecode(TargetQue
     }
   }
   return MediaDecoderReader::ResetDecode(aQueues);
 }
 
 void
 MediaFormatReader::Output(TrackType aTrack, MediaData* aSample)
 {
-  LOGV("Decoded %s sample time=%lld timecode=%lld kf=%d dur=%lld",
-       TrackTypeToStr(aTrack), aSample->mTime, aSample->mTimecode,
-       aSample->mKeyframe, aSample->mDuration);
-
   if (!aSample) {
     NS_WARNING("MediaFormatReader::Output() passed a null sample");
     Error(aTrack);
     return;
   }
 
+  LOGV("Decoded %s sample time=%lld timecode=%lld kf=%d dur=%lld",
+       TrackTypeToStr(aTrack), aSample->mTime, aSample->mTimecode,
+       aSample->mKeyframe, aSample->mDuration);
+
   RefPtr<nsIRunnable> task =
     NewRunnableMethod<TrackType, MediaData*>(
       this, &MediaFormatReader::NotifyNewOutput, aTrack, aSample);
   OwnerThread()->Dispatch(task.forget());
 }
 
 void
 MediaFormatReader::DrainComplete(TrackType aTrack)