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 Overflows in mpegSurroundDecoder_Parse()." am: e8b5674a5f 

am: d200c4e938

Change-Id: I8cb790054357f6c9d81e5b327fabb421d9479ebb
This commit is contained in:
Jean-Michel Trivi 2018-12-26 12:16:29 -08:00 committed by android-build-merger
parent 108d0898ea d200c4e938
commit c7df2a7de8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libSACdec/src/sac_dec_lib.cpp
View File

@ -1232,7 +1232,7 @@ int mpegSurroundDecoder_Parse(CMpegSurroundDecoder *pMpegSurroundDecoder,
FDK_ASSERT(pMpegSurroundDecoder->pSpatialDec); FDK_ASSERT(pMpegSurroundDecoder->pSpatialDec);
mpsBsBits = FDKgetValidBits(hBs); mpsBsBits = (INT)FDKgetValidBits(hBs);
sscParse = &pMpegSurroundDecoder sscParse = &pMpegSurroundDecoder
->spatialSpecificConfig[pMpegSurroundDecoder->bsFrameParse]; ->spatialSpecificConfig[pMpegSurroundDecoder->bsFrameParse];
@ -1308,14 +1308,14 @@ int mpegSurroundDecoder_Parse(CMpegSurroundDecoder *pMpegSurroundDecoder,
pMpegSurroundDecoder->spatialSpecificConfigBackup; pMpegSurroundDecoder->spatialSpecificConfigBackup;
/* Parse spatial specific config */ /* Parse spatial specific config */
bitsRead = FDKgetValidBits(hMpsBsData); bitsRead = (INT)FDKgetValidBits(hMpsBsData);
err = SpatialDecParseSpecificConfigHeader( err = SpatialDecParseSpecificConfigHeader(
hMpsBsData, hMpsBsData,
&pMpegSurroundDecoder->spatialSpecificConfigBackup, coreCodec, &pMpegSurroundDecoder->spatialSpecificConfigBackup, coreCodec,
pMpegSurroundDecoder->upmixType); pMpegSurroundDecoder->upmixType);
bitsRead = (bitsRead - FDKgetValidBits(hMpsBsData)); bitsRead = (bitsRead - (INT)FDKgetValidBits(hMpsBsData));
parseResult = ((err == MPS_OK) ? bitsRead : -bitsRead); parseResult = ((err == MPS_OK) ? bitsRead : -bitsRead);
if (parseResult < 0) { if (parseResult < 0) {
@ -1429,7 +1429,7 @@ int mpegSurroundDecoder_Parse(CMpegSurroundDecoder *pMpegSurroundDecoder,
bail: bail:
*pMpsDataBits -= (mpsBsBits - FDKgetValidBits(hBs)); *pMpsDataBits -= (mpsBsBits - (INT)FDKgetValidBits(hBs));
return err; return err;
} }