diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-05-08 20:36:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-08 20:36:08 +0000 |
| commit | f9f384ac375a90650cceccd4e5286672ce73e13c (patch) | |
| tree | 6817d2c2191335a0886f854347907b543b5679ec /libDRCdec | |
| parent | 7e3add342f03e5a15671c8e1da86258e344f8c86 (diff) | |
| parent | 772a7630802b7deaa3a95bcaac5a68ebba74d4e5 (diff) | |
| download | fdk-aac-f9f384ac375a90650cceccd4e5286672ce73e13c.tar.gz fdk-aac-f9f384ac375a90650cceccd4e5286672ce73e13c.tar.bz2 fdk-aac-f9f384ac375a90650cceccd4e5286672ce73e13c.zip | |
Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value in _skipEqCoefficients()." into sc-dev am: 4a9bfbf730 am: 772a763080
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471902
Change-Id: I6b150cf9359dedb1aa1484e357d87dd9b6c97f6b
Diffstat (limited to 'libDRCdec')
| -rw-r--r-- | libDRCdec/src/drcDec_reader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libDRCdec/src/drcDec_reader.cpp b/libDRCdec/src/drcDec_reader.cpp index b3ec187..b080f50 100644 --- a/libDRCdec/src/drcDec_reader.cpp +++ b/libDRCdec/src/drcDec_reader.cpp @@ -917,7 +917,7 @@ static void _skipEqCoefficients(HANDLE_FDK_BITSTREAM hBs) { firFilterOrder; int uniqueEqSubbandGainsCount, eqSubbandGainRepresentation, eqSubbandGainCount; - EQ_SUBBAND_GAIN_FORMAT eqSubbandGainFormat; + int eqSubbandGainFormat; eqDelayMaxPresent = FDKreadBits(hBs, 1); if (eqDelayMaxPresent) { @@ -958,7 +958,7 @@ static void _skipEqCoefficients(HANDLE_FDK_BITSTREAM hBs) { uniqueEqSubbandGainsCount = FDKreadBits(hBs, 6); if (uniqueEqSubbandGainsCount > 0) { eqSubbandGainRepresentation = FDKreadBits(hBs, 1); - eqSubbandGainFormat = (EQ_SUBBAND_GAIN_FORMAT)FDKreadBits(hBs, 4); + eqSubbandGainFormat = FDKreadBits(hBs, 4); switch (eqSubbandGainFormat) { case GF_QMF32: eqSubbandGainCount = 32; |