Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()."

am: 0695cff3dd

Change-Id: I053e082c034f33ef79aa42afc0e7bf04f6454cc2
This commit is contained in:
Fraunhofer IIS FDK 2018-11-27 12:38:58 -08:00 committed by android-build-merger
commit 36b3869e2c
1 changed files with 2 additions and 2 deletions

View File

@ -291,13 +291,13 @@ SACDEC_ERROR SpatialDecParseSpecificConfigHeader(
if (sacHeaderLen == 127) { if (sacHeaderLen == 127) {
sacHeaderLen += FDKreadBits(bitstream, 16); sacHeaderLen += FDKreadBits(bitstream, 16);
} }
numFillBits = FDKgetValidBits(bitstream); numFillBits = (INT)FDKgetValidBits(bitstream);
err = SpatialDecParseSpecificConfig(bitstream, pSpatialSpecificConfig, err = SpatialDecParseSpecificConfig(bitstream, pSpatialSpecificConfig,
sacHeaderLen, coreCodec); sacHeaderLen, coreCodec);
numFillBits -= numFillBits -=
FDKgetValidBits(bitstream); /* the number of read bits (tmpBits) */ (INT)FDKgetValidBits(bitstream); /* the number of read bits (tmpBits) */
numFillBits = (8 * sacHeaderLen) - numFillBits; numFillBits = (8 * sacHeaderLen) - numFillBits;
if (numFillBits < 0) { if (numFillBits < 0) {
/* Parsing went wrong */ /* Parsing went wrong */