Bug 1267637: [AT] P6. Reject audio data with unsupported channel configuration. r?gerald
MozReview-Commit-ID: IrjTi5gWp7F
--- a/dom/media/platforms/apple/AppleATDecoder.cpp
+++ b/dom/media/platforms/apple/AppleATDecoder.cpp
@@ -278,16 +278,19 @@ AppleATDecoder::DecodeSample(MediaRawDat
AudioSampleBuffer data(outputData.Elements(), outputData.Length());
if (!data.Data()) {
return NS_ERROR_OUT_OF_MEMORY;
}
if (mChannelLayout && !mAudioConverter) {
AudioConfig in(*mChannelLayout.get(), rate);
AudioConfig out(channels, rate);
+ if (!in.IsValid() || !out.IsValid()) {
+ return NS_ERROR_FAILURE;
+ }
mAudioConverter = MakeUnique<AudioConverter>(in, out);
}
if (mAudioConverter) {
MOZ_ASSERT(mAudioConverter->CanWorkInPlace());
data = mAudioConverter->Process(Move(data));
}
RefPtr<AudioData> audio = new AudioData(aSample->mOffset,