fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Restrict sampling rates parsed from bitstream to maximum of 96kHz. 

Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I2511a7cfcdf1bae57d17c02c93867ccc4f1ea693
This commit is contained in:
Fraunhofer IIS FDK 2019-08-09 17:05:33 +02:00 committed by Jean-Michel Trivi
parent 17bc55672e
commit cc825aecf5
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libMpegTPDec/src/tpdec_asc.cpp
View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android Software License for The Fraunhofer FDK AAC Codec Library for Android
© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten © Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -1440,7 +1440,8 @@ static TRANSPORTDEC_ERROR EldSpecificConfig_Parse(CSAudioSpecificConfig *asc,
UCHAR tmpDownscaleFreqIdx; UCHAR tmpDownscaleFreqIdx;
esc->m_downscaledSamplingFrequency = esc->m_downscaledSamplingFrequency =
getSampleRate(hBs, &tmpDownscaleFreqIdx, 4); getSampleRate(hBs, &tmpDownscaleFreqIdx, 4);
if (esc->m_downscaledSamplingFrequency == 0) { if (esc->m_downscaledSamplingFrequency == 0 ||
esc->m_downscaledSamplingFrequency > 96000) {
return TRANSPORTDEC_PARSE_ERROR; return TRANSPORTDEC_PARSE_ERROR;
} }
downscale_fill_nibble = FDKreadBits(hBs, 4); downscale_fill_nibble = FDKreadBits(hBs, 4);
@ -1948,6 +1949,9 @@ static TRANSPORTDEC_ERROR UsacConfig_Parse(CSAudioSpecificConfig *asc,
INT nbits = (INT)FDKgetValidBits(hBs); INT nbits = (INT)FDKgetValidBits(hBs);
usacSamplingFrequency = getSampleRate(hBs, &asc->m_samplingFrequencyIndex, 5); usacSamplingFrequency = getSampleRate(hBs, &asc->m_samplingFrequencyIndex, 5);
if (usacSamplingFrequency == 0 || usacSamplingFrequency > 96000) {
return TRANSPORTDEC_PARSE_ERROR;
}
asc->m_samplingFrequency = (UINT)usacSamplingFrequency; asc->m_samplingFrequency = (UINT)usacSamplingFrequency;
coreSbrFrameLengthIndex = FDKreadBits(hBs, 3); coreSbrFrameLengthIndex = FDKreadBits(hBs, 3);
@ -2027,7 +2031,8 @@ static TRANSPORTDEC_ERROR AudioSpecificConfig_ExtensionParse(
self->m_extensionSamplingFrequency = getSampleRate( self->m_extensionSamplingFrequency = getSampleRate(
bs, &self->m_extensionSamplingFrequencyIndex, 4); bs, &self->m_extensionSamplingFrequencyIndex, 4);
if ((INT)self->m_extensionSamplingFrequency <= 0) { if (self->m_extensionSamplingFrequency == 0 ||
self->m_extensionSamplingFrequency > 96000) {
return TRANSPORTDEC_PARSE_ERROR; return TRANSPORTDEC_PARSE_ERROR;
} }
} }
@ -2153,6 +2158,10 @@ TRANSPORTDEC_ERROR AudioSpecificConfig_Parse(
self->m_extensionSamplingFrequency = self->m_extensionSamplingFrequency =
getSampleRate(bs, &self->m_extensionSamplingFrequencyIndex, 4); getSampleRate(bs, &self->m_extensionSamplingFrequencyIndex, 4);
if (self->m_extensionSamplingFrequency == 0 ||
self->m_extensionSamplingFrequency > 96000) {
return TRANSPORTDEC_PARSE_ERROR;
}
self->m_aot = getAOT(bs); self->m_aot = getAOT(bs);
switch (self->m_aot) { switch (self->m_aot) {