From 55981c914197aee6d277ff5cd28b5b42d498c79d Mon Sep 17 00:00:00 2001
From: Jean-Yves Avenard <jyavenard@mozilla.com>
Date: Tue, 7 Feb 2017 08:55:28 +0100
Subject: [PATCH] Bug 1325707: P1. Check returned value. r=gerald

This is really just for cleanliness perspective, as it can never happen, we always check that demuxing a packet succeeded first.

MozReview-Commit-ID: FQ1yz16m9Ix

--HG--
extra : rebase_source : 722ab3a828cadb07022a95b3ae456ef09781e61d
---
 dom/media/ogg/OggCodecState.cpp | 3 +++
 dom/media/ogg/OggDemuxer.cpp    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/dom/media/ogg/OggCodecState.cpp b/dom/media/ogg/OggCodecState.cpp
index fa5a1f3fcc9e..34cfcbb26278 100644
--- a/dom/media/ogg/OggCodecState.cpp
+++ b/dom/media/ogg/OggCodecState.cpp
@@ -1305,6 +1305,9 @@ OpusState::PacketOutAsMediaRawData()
   }
 
   RefPtr<MediaRawData> data = OggCodecState::PacketOutAsMediaRawData();
+  if (!data) {
+    return nullptr;
+  }
 
   if (data->mEOS && mPrevPacketGranulepos != -1) {
     // If this is the last packet, perform end trimming.
diff --git a/dom/media/ogg/OggDemuxer.cpp b/dom/media/ogg/OggDemuxer.cpp
index 07a0437151aa..58d1cf54d337 100644
--- a/dom/media/ogg/OggDemuxer.cpp
+++ b/dom/media/ogg/OggDemuxer.cpp
@@ -1342,6 +1342,9 @@ OggTrackDemuxer::NextSample()
   bool eos = packet->e_o_s;
   OggCodecState* state = mParent->GetTrackCodecState(mType);
   RefPtr<MediaRawData> data = state->PacketOutAsMediaRawData();
+  if (!data) {
+    return nullptr;
+  }
   if (mType == TrackInfo::kAudioTrack) {
     data->mTrackInfo = mParent->mSharedAudioTrackInfo;
   }