commit b7f477ae47848f01a9f8802f155ae345218b880f
author Jean-Michel Trivi <jmtrivi@google.com> Wed Dec 26 15:00:36 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 26 15:00:36 2018 -0800
tree af4b53e39c2e5958449e86f25788fc50fa83166e
parent c7df2a7de8a32f8cdae1ee60e06192c7d2997b4f
parent 0102aec77e929f3fafbb674d4d6e4da954ac098d

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

Change-Id: I6c33cc8803833da107e6ee70b503efd10ba1909e

libMpegTPDec/src/tpdec_lib.cpp

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 @@
             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,