diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2017-11-03 19:28:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-03 19:28:41 +0000 |
| commit | 77aac03fb66b8016e837e43e5dc15480f2c43700 (patch) | |
| tree | 77a2e96c0d102dbc846a13bc59442d45ec5a103c /libSBRdec | |
| parent | a9a123b2fbd2801c7f518b4a1b4f3ea32d36a96e (diff) | |
| parent | 902decfc9936a3d34f30fe3ce541222243bfc736 (diff) | |
| download | fdk-aac-77aac03fb66b8016e837e43e5dc15480f2c43700.tar.gz fdk-aac-77aac03fb66b8016e837e43e5dc15480f2c43700.tar.bz2 fdk-aac-77aac03fb66b8016e837e43e5dc15480f2c43700.zip | |
Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97 am: 06c27a9feb am: e6b649a380
am: 902decfc99
Change-Id: I04632c3154dddc9c6b7b80d4f3393dc20194dd27
Diffstat (limited to 'libSBRdec')
| -rw-r--r-- | libSBRdec/src/lpp_tran.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libSBRdec/src/lpp_tran.cpp b/libSBRdec/src/lpp_tran.cpp index 117e739..343aec3 100644 --- a/libSBRdec/src/lpp_tran.cpp +++ b/libSBRdec/src/lpp_tran.cpp @@ -293,7 +293,7 @@ void lppTransposer (HANDLE_SBR_LPP_TRANS hLppTrans, /*!< Handle of lpp transp } /* init bwIndex for each patch */ - FDKmemclear(bwIndex, pSettings->noOfPatches*sizeof(INT)); + FDKmemclear(bwIndex, MAX_NUM_PATCHES*sizeof(INT)); /* Calc common low band scale factor @@ -621,9 +621,9 @@ void lppTransposer (HANDLE_SBR_LPP_TRANS hLppTrans, /*!< Handle of lpp transp FDK_ASSERT( hiBand < (64) ); /* bwIndex[patch] is already initialized with value from previous band inside this patch */ - while (hiBand >= pSettings->bwBorders[bwIndex[patch]]) + while (hiBand >= pSettings->bwBorders[bwIndex[patch]] && bwIndex[patch] < MAX_NUM_PATCHES-1) { bwIndex[patch]++; - + } /* Filter Step 2: add the left slope with the current filter to the buffer @@ -962,6 +962,10 @@ resetLppTransposer (HANDLE_SBR_LPP_TRANS hLppTrans, /*!< Handle of lpp transpos for(i = 0 ; i < noNoiseBands; i++){ pSettings->bwBorders[i] = noiseBandTable[i+1]; } + for (;i < MAX_NUM_NOISE_VALUES; i++) { + pSettings->bwBorders[i] = 255; + } + /* * Choose whitening factors |