fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix integer overflow in imlt_block(). 

Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ia7e03bbf6daef61079514de407a5900f6dc22a21
This commit is contained in:
Fraunhofer IIS FDK 2019-10-18 14:04:32 +02:00 committed by Jean-Michel Trivi
parent 920ecc7487
commit b8f7bab39c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libFDK/src/mdct.cpp
View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android Software License for The Fraunhofer FDK AAC Codec Library for Android
© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten © Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -569,7 +569,7 @@ INT imlt_block(H_MDCT hMdct, FIXP_DBL *output, FIXP_DBL *spectrum,
*/ */
for (i = 0; i < hMdct->prev_nr; i++) { for (i = 0; i < hMdct->prev_nr; i++) {
FIXP_DBL x = -(*pOvl--); FIXP_DBL x = -(*pOvl--);
*pOut0 = IMDCT_SCALE_DBL(x + hMdct->pFacZir[i]); *pOut0 = fAddSaturate(x, IMDCT_SCALE_DBL(hMdct->pFacZir[i]));
pOut0++; pOut0++;
} }
hMdct->pFacZir = NULL; hMdct->pFacZir = NULL;
@ -678,7 +678,7 @@ INT imlt_block(H_MDCT hMdct, FIXP_DBL *output, FIXP_DBL *spectrum,
FIXP_DBL *pOut = pOut0 - fl / 2; FIXP_DBL *pOut = pOut0 - fl / 2;
FDK_ASSERT(fl / 2 <= 128); FDK_ASSERT(fl / 2 <= 128);
for (i = 0; i < fl / 2; i++) { for (i = 0; i < fl / 2; i++) {
pOut[i] += IMDCT_SCALE_DBL(hMdct->pFacZir[i]); pOut[i] = fAddSaturate(pOut[i], IMDCT_SCALE_DBL(hMdct->pFacZir[i]));
} }
hMdct->pFacZir = NULL; hMdct->pFacZir = NULL;
} }