diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2017-11-03 19:13:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-03 19:13:45 +0000 |
| commit | d8e897ae9eed8d47c711e0597836e61bbf801493 (patch) | |
| tree | 3d84ce4793ebad93494c93f8524e91f57ad77ed1 | |
| parent | 2bebb8fb65dfb559fca65906d14d0c81755b24d2 (diff) | |
| parent | fca10279378c5e92ba1fb26ea66651a68dad87e5 (diff) | |
| download | fdk-aac-d8e897ae9eed8d47c711e0597836e61bbf801493.tar.gz fdk-aac-d8e897ae9eed8d47c711e0597836e61bbf801493.tar.bz2 fdk-aac-d8e897ae9eed8d47c711e0597836e61bbf801493.zip | |
Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754
am: fca1027937
Change-Id: I8803d858a432aea8fba8b7ec29ba28458e7418d8
| -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 |