aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2018-11-27 11:13:30 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-11-27 11:13:30 -0800
commit3a64e48ede95507a64b05e5c9119667b5edc3ddd (patch)
treea42445d43b95ccd540af2103c43b632aa28cd0fb
parentd555cedc95bf978bed1927476b0b81d16995b2c4 (diff)
parentc580437d7caf8b2efaeaeb50440815149cd788bd (diff)
downloadfdk-aac-3a64e48ede95507a64b05e5c9119667b5edc3ddd.tar.gz
fdk-aac-3a64e48ede95507a64b05e5c9119667b5edc3ddd.tar.bz2
fdk-aac-3a64e48ede95507a64b05e5c9119667b5edc3ddd.zip
Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()." am: 0a1e3b6ef9
am: c580437d7c Change-Id: Id8f177954c585644d0535a44560fa3923780a764
-rw-r--r--libAACdec/src/aacdecoder_lib.cpp2
1 files changed, 1 insertions, 1 deletions
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 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern,
} /* 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) ||