diff options
| author | Xin Li <delphij@google.com> | 2019-09-04 13:33:32 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-09-04 13:33:32 -0700 |
| commit | a209adb315f970aa97044a82551a6f5617d61ded (patch) | |
| tree | fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /libSACdec/src/sac_bitdec.cpp | |
| parent | c2eb64586d6dfc0f067ea66631b38d1922a106ed (diff) | |
| parent | 62661035192a7f66b3722d8a1fd365391a35f292 (diff) | |
| download | fdk-aac-a209adb315f970aa97044a82551a6f5617d61ded.tar.gz fdk-aac-a209adb315f970aa97044a82551a6f5617d61ded.tar.bz2 fdk-aac-a209adb315f970aa97044a82551a6f5617d61ded.zip | |
DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c
Diffstat (limited to 'libSACdec/src/sac_bitdec.cpp')
| -rw-r--r-- | libSACdec/src/sac_bitdec.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libSACdec/src/sac_bitdec.cpp b/libSACdec/src/sac_bitdec.cpp index 883e1e8..a1bdca4 100644 --- a/libSACdec/src/sac_bitdec.cpp +++ b/libSACdec/src/sac_bitdec.cpp @@ -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]; |