diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2018-11-28 13:35:05 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-28 13:35:05 -0800 |
| commit | 9cfaf0cd45999a12981ba4b6c86fee5120d56449 (patch) | |
| tree | d7912e8d36871d2e0d9798561a1e1ed8ba6d386f | |
| parent | 36b3869e2cbfa2344bd3fc07d772dc77fb7fc2df (diff) | |
| parent | b8a384b0cd7bf2447bc342f14b01eda81e6c23a6 (diff) | |
| download | fdk-aac-9cfaf0cd45999a12981ba4b6c86fee5120d56449.tar.gz fdk-aac-9cfaf0cd45999a12981ba4b6c86fee5120d56449.tar.bz2 fdk-aac-9cfaf0cd45999a12981ba4b6c86fee5120d56449.zip | |
Merge "Add sanity check for allowed LPD sampling rate."
am: b8a384b0cd
Change-Id: Iedcbbbee9ffc6b27cbc2f114b110974320f9044b
| -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; } |