Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()." am: 0a1e3b6ef9

am: c580437d7c

Change-Id: Id8f177954c585644d0535a44560fa3923780a764
This commit is contained in:
Fraunhofer IIS FDK 2018-11-27 11:13:30 -08:00 committed by android-build-merger
commit 3a64e48ede
1 changed files with 1 additions and 1 deletions

View File

@ -1882,7 +1882,7 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern,
} /* USAC DASH IPF flushing possible end */ } /* USAC DASH IPF flushing possible end */
if (accessUnit < numPrerollAU) { if (accessUnit < numPrerollAU) {
FDKpushBack(hBsAu, auStartAnchor - FDKgetValidBits(hBsAu)); FDKpushBack(hBsAu, auStartAnchor - (INT)FDKgetValidBits(hBsAu));
} else { } else {
if ((self->buildUpStatus == AACDEC_RSV60_BUILD_UP_ON) || if ((self->buildUpStatus == AACDEC_RSV60_BUILD_UP_ON) ||
(self->buildUpStatus == AACDEC_RSV60_BUILD_UP_ON_IN_BAND) || (self->buildUpStatus == AACDEC_RSV60_BUILD_UP_ON_IN_BAND) ||