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

Merge "Unsigned Integer Overflow in InitSegmentBitfield()" am: 4899e80a17 

am: ca0d8e7461

Change-Id: Ia4e0396a4df14d667f80aded10631815b715e2c2
This commit is contained in:
Jean-Michel Trivi 2018-12-26 18:35:45 -08:00 committed by android-build-merger
parent d145d90619 ca0d8e7461
commit cafc42b5eb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libAACdec/src/aacdec_hcrs.cpp
View File

@ -367,7 +367,10 @@ static UINT InitSegmentBitfield(UINT *pNumSegment,
UINT tempWord;
USHORT numValidSegment;
*pNumWordForBitfield = ((*pNumSegment - 1) >> THIRTYTWO_LOG_DIV_TWO_LOG) + 1;
*pNumWordForBitfield =
(*pNumSegment == 0)
? 0
: ((*pNumSegment - 1) >> THIRTYTWO_LOG_DIV_TWO_LOG) + 1;
/* loop over all words, which are completely used or only partial */
/* bit in pSegmentBitfield is zero if segment is empty; bit in