1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-01-15 16:56:29 +01:00

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

This commit is contained in:
Jean-Michel Trivi 2019-03-08 14:52:26 +00:00 committed by Android (Google) Code Review
commit f164a97189

View File

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