diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-26 15:00:36 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-26 15:00:36 -0800 |
| commit | b7f477ae47848f01a9f8802f155ae345218b880f (patch) | |
| tree | af4b53e39c2e5958449e86f25788fc50fa83166e /libMpegTPDec | |
| parent | c7df2a7de8a32f8cdae1ee60e06192c7d2997b4f (diff) | |
| parent | 0102aec77e929f3fafbb674d4d6e4da954ac098d (diff) | |
| download | fdk-aac-b7f477ae47848f01a9f8802f155ae345218b880f.tar.gz fdk-aac-b7f477ae47848f01a9f8802f155ae345218b880f.tar.bz2 fdk-aac-b7f477ae47848f01a9f8802f155ae345218b880f.zip | |
Merge "Unsigned Integer Overflow in transportDec_AdjustEndOfAccessUnit()." am: 7f3b4de053
am: 0102aec77e
Change-Id: I6c33cc8803833da107e6ee70b503efd10ba1909e
Diffstat (limited to 'libMpegTPDec')
| -rw-r--r-- | libMpegTPDec/src/tpdec_lib.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libMpegTPDec/src/tpdec_lib.cpp b/libMpegTPDec/src/tpdec_lib.cpp index 1d8b7b3..cee0768 100644 --- a/libMpegTPDec/src/tpdec_lib.cpp +++ b/libMpegTPDec/src/tpdec_lib.cpp @@ -736,9 +736,9 @@ static TRANSPORTDEC_ERROR transportDec_AdjustEndOfAccessUnit( hTp->parser.latm.m_audioMuxLengthBytes > 0) { int loasOffset; - loasOffset = (hTp->parser.latm.m_audioMuxLengthBytes * 8 + - FDKgetValidBits(hBs)) - - hTp->globalFramePos; + loasOffset = ((INT)hTp->parser.latm.m_audioMuxLengthBytes * 8 + + (INT)FDKgetValidBits(hBs)) - + (INT)hTp->globalFramePos; if (loasOffset != 0) { FDKpushBiDirectional(hBs, loasOffset); /* For ELD and other payloads there is an unknown amount of padding, |