Merge "Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()"

am: a5cf260931

Change-Id: Ib3c4c335ef6bbfdccd4db91b03f5f0cdde7705a3
This commit is contained in:
Jean-Michel Trivi 2018-12-26 18:03:27 -08:00 committed by android-build-merger
commit 466adf2a1b
1 changed files with 1 additions and 1 deletions

View File

@ -775,7 +775,7 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_PreRollExtensionPayloadParse(
/* For every AU get length and offset in the bitstream */ /* For every AU get length and offset in the bitstream */
prerollAULength[i] = escapedValue(hBs, 16, 16, 0); prerollAULength[i] = escapedValue(hBs, 16, 16, 0);
if (prerollAULength[i] > 0) { if (prerollAULength[i] > 0) {
prerollAUOffset[i] = auStartAnchor - FDKgetValidBits(hBs); prerollAUOffset[i] = auStartAnchor - (INT)FDKgetValidBits(hBs);
independencyFlag = FDKreadBit(hBs); independencyFlag = FDKreadBit(hBs);
if (i == 0 && !independencyFlag) { if (i == 0 && !independencyFlag) {
*numPrerollAU = 0; *numPrerollAU = 0;