aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec/src
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2018-12-26 18:03:27 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-26 18:03:27 -0800
commit466adf2a1b74e4ec204e4852c18d8a5267dd5e38 (patch)
tree4c5b82a893f355d77a198904d0b26081a406be81 /libAACdec/src
parent485d02df7368ab2fea4da170d5087d0eea95722a (diff)
parenta5cf260931f577091554fb1ad8cdee97994b55f9 (diff)
downloadfdk-aac-466adf2a1b74e4ec204e4852c18d8a5267dd5e38.tar.gz
fdk-aac-466adf2a1b74e4ec204e4852c18d8a5267dd5e38.tar.bz2
fdk-aac-466adf2a1b74e4ec204e4852c18d8a5267dd5e38.zip
Merge "Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()"
am: a5cf260931 Change-Id: Ib3c4c335ef6bbfdccd4db91b03f5f0cdde7705a3
Diffstat (limited to 'libAACdec/src')
-rw-r--r--libAACdec/src/aacdecoder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp
index 24907ee..8993927 100644
--- a/libAACdec/src/aacdecoder.cpp
+++ b/libAACdec/src/aacdecoder.cpp
@@ -775,7 +775,7 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_PreRollExtensionPayloadParse(
/* For every AU get length and offset in the bitstream */
prerollAULength[i] = escapedValue(hBs, 16, 16, 0);
if (prerollAULength[i] > 0) {
- prerollAUOffset[i] = auStartAnchor - FDKgetValidBits(hBs);
+ prerollAUOffset[i] = auStartAnchor - (INT)FDKgetValidBits(hBs);
independencyFlag = FDKreadBit(hBs);
if (i == 0 && !independencyFlag) {
*numPrerollAU = 0;