diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-26 12:16:29 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-12-26 12:16:29 -0800 |
commit | c7df2a7de8a32f8cdae1ee60e06192c7d2997b4f (patch) | |
tree | 82c07cbbcbc82981577834ad2087b1a99c1f0645 | |
parent | 108d0898ea34ba106af26c6acb2b9b16ca23773a (diff) | |
parent | d200c4e9385ac0c3eb008b60c6314931b143b9d3 (diff) | |
download | fdk-aac-c7df2a7de8a32f8cdae1ee60e06192c7d2997b4f.tar.gz fdk-aac-c7df2a7de8a32f8cdae1ee60e06192c7d2997b4f.tar.bz2 fdk-aac-c7df2a7de8a32f8cdae1ee60e06192c7d2997b4f.zip |
Merge "Unsigned Integer Overflows in mpegSurroundDecoder_Parse()." am: e8b5674a5f
am: d200c4e938
Change-Id: I8cb790054357f6c9d81e5b327fabb421d9479ebb
-rw-r--r-- | libSACdec/src/sac_dec_lib.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libSACdec/src/sac_dec_lib.cpp b/libSACdec/src/sac_dec_lib.cpp index ebf9bee..5ae89d1 100644 --- a/libSACdec/src/sac_dec_lib.cpp +++ b/libSACdec/src/sac_dec_lib.cpp @@ -1232,7 +1232,7 @@ int mpegSurroundDecoder_Parse(CMpegSurroundDecoder *pMpegSurroundDecoder, FDK_ASSERT(pMpegSurroundDecoder->pSpatialDec); - mpsBsBits = FDKgetValidBits(hBs); + mpsBsBits = (INT)FDKgetValidBits(hBs); sscParse = &pMpegSurroundDecoder ->spatialSpecificConfig[pMpegSurroundDecoder->bsFrameParse]; @@ -1308,14 +1308,14 @@ int mpegSurroundDecoder_Parse(CMpegSurroundDecoder *pMpegSurroundDecoder, pMpegSurroundDecoder->spatialSpecificConfigBackup; /* Parse spatial specific config */ - bitsRead = FDKgetValidBits(hMpsBsData); + bitsRead = (INT)FDKgetValidBits(hMpsBsData); err = SpatialDecParseSpecificConfigHeader( hMpsBsData, &pMpegSurroundDecoder->spatialSpecificConfigBackup, coreCodec, pMpegSurroundDecoder->upmixType); - bitsRead = (bitsRead - FDKgetValidBits(hMpsBsData)); + bitsRead = (bitsRead - (INT)FDKgetValidBits(hMpsBsData)); parseResult = ((err == MPS_OK) ? bitsRead : -bitsRead); if (parseResult < 0) { @@ -1429,7 +1429,7 @@ int mpegSurroundDecoder_Parse(CMpegSurroundDecoder *pMpegSurroundDecoder, bail: - *pMpsDataBits -= (mpsBsBits - FDKgetValidBits(hBs)); + *pMpsDataBits -= (mpsBsBits - (INT)FDKgetValidBits(hBs)); return err; } |