diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-26 18:19:25 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-26 18:19:25 -0800 |
| commit | 58600c035a18bba6ad5956be9c224bcb0eefa9db (patch) | |
| tree | 1496f2a9d48c397e230bef0b26d47abd0908de93 /libAACdec | |
| parent | f87befcf3b88a973e375f4b20b5587e1a6d35530 (diff) | |
| parent | d07eeb453f9bc1cb05fb03391a6a9a1dab2f6fae (diff) | |
| download | fdk-aac-58600c035a18bba6ad5956be9c224bcb0eefa9db.tar.gz fdk-aac-58600c035a18bba6ad5956be9c224bcb0eefa9db.tar.bz2 fdk-aac-58600c035a18bba6ad5956be9c224bcb0eefa9db.zip | |
Merge "Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()" am: a5cf260931 am: 466adf2a1b
am: d07eeb453f
Change-Id: Id09444e5b08161f79053c09e42d686551a2b05e5
Diffstat (limited to 'libAACdec')
| -rw-r--r-- | libAACdec/src/aacdecoder.cpp | 2 |
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; |