commit b8a384b0cd7bf2447bc342f14b01eda81e6c23a6
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 28 21:21:41 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 28 21:21:41 2018 +0000
tree d7912e8d36871d2e0d9798561a1e1ed8ba6d386f
parent 0695cff3ddcccae44d347a3ed25ef52f86b884a0
parent c6b4af4a6c4ea03025aacb8c60e54a79e2ab8129

Merge "Add sanity check for allowed LPD sampling rate."

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