diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2018-11-28 13:40:48 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-28 13:40:48 -0800 |
| commit | 07ed1f756bd1ee6f61d635f232e373b8f4f049b9 (patch) | |
| tree | 6229477f929dcd17838f9f45efdfa5f43ece7b5e /libAACdec/src | |
| parent | 479cc5a6d46f46dd6a6bf1780e265a246a446e54 (diff) | |
| parent | 9cfaf0cd45999a12981ba4b6c86fee5120d56449 (diff) | |
| download | fdk-aac-07ed1f756bd1ee6f61d635f232e373b8f4f049b9.tar.gz fdk-aac-07ed1f756bd1ee6f61d635f232e373b8f4f049b9.tar.bz2 fdk-aac-07ed1f756bd1ee6f61d635f232e373b8f4f049b9.zip | |
Merge "Add sanity check for allowed LPD sampling rate." am: b8a384b0cd
am: 9cfaf0cd45
Change-Id: I0c9952fe8b16ae2e8d4cb80b30d63ba00e172b09
Diffstat (limited to 'libAACdec/src')
| -rw-r--r-- | libAACdec/src/usacdec_lpd.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libAACdec/src/usacdec_lpd.cpp b/libAACdec/src/usacdec_lpd.cpp index 22069a6..fde34ef 100644 --- a/libAACdec/src/usacdec_lpd.cpp +++ b/libAACdec/src/usacdec_lpd.cpp @@ -1221,8 +1221,7 @@ AAC_DECODER_ERROR CLpdChannelStream_Read( (INT)(samplingRate * PIT_MIN_12k8 + (FSCALE_DENOM / 2)) / FSCALE_DENOM - (INT)PIT_MIN_12k8; - if (pSamplingRateInfo->samplingRate > - FAC_FSCALE_MAX /* maximum allowed core sampling frequency */) { + if ((samplingRate < FAC_FSCALE_MIN) || (samplingRate > FAC_FSCALE_MAX)) { error = AAC_DEC_PARSE_ERROR; goto bail; } |