diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-26 14:56:29 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-12-26 14:56:29 -0800 |
commit | 0102aec77e929f3fafbb674d4d6e4da954ac098d (patch) | |
tree | 31152d34357f36308de7088dad1ed525e3879f76 | |
parent | d200c4e9385ac0c3eb008b60c6314931b143b9d3 (diff) | |
parent | 7f3b4de05380a49ac90d336d91e3509fe139a244 (diff) | |
download | fdk-aac-0102aec77e929f3fafbb674d4d6e4da954ac098d.tar.gz fdk-aac-0102aec77e929f3fafbb674d4d6e4da954ac098d.tar.bz2 fdk-aac-0102aec77e929f3fafbb674d4d6e4da954ac098d.zip |
Merge "Unsigned Integer Overflow in transportDec_AdjustEndOfAccessUnit()."
am: 7f3b4de053
Change-Id: I129ac675f560590ff1a082cc701a77ae173da707
-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, |