commit 3a64e48ede95507a64b05e5c9119667b5edc3ddd
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> Tue Nov 27 11:13:30 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 27 11:13:30 2018 -0800
tree a42445d43b95ccd540af2103c43b632aa28cd0fb
parent d555cedc95bf978bed1927476b0b81d16995b2c4
parent c580437d7caf8b2efaeaeb50440815149cd788bd

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

Change-Id: Id8f177954c585644d0535a44560fa3923780a764

libAACdec/src/aacdecoder_lib.cpp

diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp
index ea52bb5..b528ef1 100644
--- a/libAACdec/src/aacdecoder_lib.cpp
+++ b/libAACdec/src/aacdecoder_lib.cpp
@@ -1882,7 +1882,7 @@
 
     } /* USAC DASH IPF flushing possible end */
     if (accessUnit < numPrerollAU) {
-      FDKpushBack(hBsAu, auStartAnchor - FDKgetValidBits(hBsAu));
+      FDKpushBack(hBsAu, auStartAnchor - (INT)FDKgetValidBits(hBsAu));
     } else {
       if ((self->buildUpStatus == AACDEC_RSV60_BUILD_UP_ON) ||
           (self->buildUpStatus == AACDEC_RSV60_BUILD_UP_ON_IN_BAND) ||