commit c6b4af4a6c4ea03025aacb8c60e54a79e2ab8129
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> Fri Jun 08 18:06:35 2018 +0200
committer Jean-Michel Trivi <jmtrivi@google.com> Wed Nov 28 19:15:09 2018 +0000
tree 0ea76b02fd3d7c0db2bcd3cfc6a4bd865f77c7f5
parent 78f80da872c305122f0a439402cc069d8b3b0a5c

Add sanity check for allowed LPD sampling rate.

Bug: 112662981
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I0702024adc07ed463db795dd48f4efd3de1d7896
Merged-In: Idc9c44a9755b8151d5c7d8107696f43ac592413b

libAACdec/src/usacdec_lpd.cpp

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 @@
       (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;
   }