From c6b4af4a6c4ea03025aacb8c60e54a79e2ab8129 Mon Sep 17 00:00:00 2001 From: Fraunhofer IIS FDK Date: Fri, 8 Jun 2018 18:06:35 +0200 Subject: [PATCH] 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 | 3 +-- 1 file changed, 1 insertion(+), 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; }