diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-05-08 20:11:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-08 20:11:05 +0000 |
| commit | f67caf892cd6bcadfbd2e57b83b3d35f3daf7312 (patch) | |
| tree | 6817d2c2191335a0886f854347907b543b5679ec /libDRCdec | |
| parent | 1b5b22b9fc79e214c28b96b72db02f3726208356 (diff) | |
| parent | 4a9bfbf7303112c8dc1b72bf74d25dfbe576d71c (diff) | |
| download | fdk-aac-f67caf892cd6bcadfbd2e57b83b3d35f3daf7312.tar.gz fdk-aac-f67caf892cd6bcadfbd2e57b83b3d35f3daf7312.tar.bz2 fdk-aac-f67caf892cd6bcadfbd2e57b83b3d35f3daf7312.zip | |
Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value in _skipEqCoefficients()." into sc-dev am: 4a9bfbf730
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471902
Change-Id: If1e1fa8ba514f72fff2e14968f59e62ed2d07b3d
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; |