fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-01-28 14:39:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge "AAC decoder: fix use of uninitialized value, check index"

Browse Source
This commit is contained in:
Jean-Michel Trivi 2019-03-08 14:52:26 +00:00 committed by Android (Google) Code Review
commit f164a97189
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libSACdec/src/sac_bitdec.cpp
View File

@ -1457,7 +1457,7 @@ static SACDEC_ERROR mapIndexData(
FIXP_DBL (*pOttVsTotDb1)[MAX_PARAMETER_SETS][MAX_PARAMETER_BANDS], FIXP_DBL (*pOttVsTotDb1)[MAX_PARAMETER_SETS][MAX_PARAMETER_BANDS],
FIXP_DBL (*pOttVsTotDb2)[MAX_PARAMETER_SETS][MAX_PARAMETER_BANDS]) { FIXP_DBL (*pOttVsTotDb2)[MAX_PARAMETER_SETS][MAX_PARAMETER_BANDS]) {
int aParamSlots[MAX_PARAMETER_SETS]; int aParamSlots[MAX_PARAMETER_SETS];
int aInterpolate[MAX_PARAMETER_SETS]; int aInterpolate[MAX_PARAMETER_SETS] = {0};
int dataSets; int dataSets;
int aMap[MAX_PARAMETER_BANDS + 1]; int aMap[MAX_PARAMETER_BANDS + 1];
@ -1562,6 +1562,7 @@ static SACDEC_ERROR mapIndexData(
i2 = i; i2 = i;
while (aInterpolate[i2] == 1) { while (aInterpolate[i2] == 1) {
i2++; i2++;
if (i2 >= MAX_PARAMETER_SETS) return MPS_WRONG_PARAMETERSETS;
} }
x1 = paramSlot[i1]; x1 = paramSlot[i1];
xi = paramSlot[i]; xi = paramSlot[i];