1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-06-05 22:39:13 +02:00

Merge "Unsigned Integer Overflow in transportDec_AdjustEndOfAccessUnit()." am: 7f3b4de053

am: 0102aec77e

Change-Id: I6c33cc8803833da107e6ee70b503efd10ba1909e
This commit is contained in:
Jean-Michel Trivi
2018-12-26 15:00:36 -08:00
committed by android-build-merger

View File

@@ -736,9 +736,9 @@ static TRANSPORTDEC_ERROR transportDec_AdjustEndOfAccessUnit(
hTp->parser.latm.m_audioMuxLengthBytes > 0) { hTp->parser.latm.m_audioMuxLengthBytes > 0) {
int loasOffset; int loasOffset;
loasOffset = (hTp->parser.latm.m_audioMuxLengthBytes * 8 + loasOffset = ((INT)hTp->parser.latm.m_audioMuxLengthBytes * 8 +
FDKgetValidBits(hBs)) - (INT)FDKgetValidBits(hBs)) -
hTp->globalFramePos; (INT)hTp->globalFramePos;
if (loasOffset != 0) { if (loasOffset != 0) {
FDKpushBiDirectional(hBs, loasOffset); FDKpushBiDirectional(hBs, loasOffset);
/* For ELD and other payloads there is an unknown amount of padding, /* For ELD and other payloads there is an unknown amount of padding,