aboutsummaryrefslogtreecommitdiffstats
path: root/libSACdec
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2018-11-27 12:47:01 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-11-27 12:47:01 -0800
commit479cc5a6d46f46dd6a6bf1780e265a246a446e54 (patch)
treefac26c8603148f18d7c970dbc32f28c25cb9c3e0 /libSACdec
parent3a64e48ede95507a64b05e5c9119667b5edc3ddd (diff)
parent36b3869e2cbfa2344bd3fc07d772dc77fb7fc2df (diff)
downloadfdk-aac-479cc5a6d46f46dd6a6bf1780e265a246a446e54.tar.gz
fdk-aac-479cc5a6d46f46dd6a6bf1780e265a246a446e54.tar.bz2
fdk-aac-479cc5a6d46f46dd6a6bf1780e265a246a446e54.zip
Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()." am: 0695cff3dd
am: 36b3869e2c Change-Id: I2a7d3a865dce40cbce0c2b345b8f489a8e4a7e3f
Diffstat (limited to 'libSACdec')
-rw-r--r--libSACdec/src/sac_bitdec.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libSACdec/src/sac_bitdec.cpp b/libSACdec/src/sac_bitdec.cpp
index 37e0cf2..45fb17a 100644
--- a/libSACdec/src/sac_bitdec.cpp
+++ b/libSACdec/src/sac_bitdec.cpp
@@ -291,13 +291,13 @@ SACDEC_ERROR SpatialDecParseSpecificConfigHeader(
if (sacHeaderLen == 127) {
sacHeaderLen += FDKreadBits(bitstream, 16);
}
- numFillBits = FDKgetValidBits(bitstream);
+ numFillBits = (INT)FDKgetValidBits(bitstream);
err = SpatialDecParseSpecificConfig(bitstream, pSpatialSpecificConfig,
sacHeaderLen, coreCodec);
numFillBits -=
- FDKgetValidBits(bitstream); /* the number of read bits (tmpBits) */
+ (INT)FDKgetValidBits(bitstream); /* the number of read bits (tmpBits) */
numFillBits = (8 * sacHeaderLen) - numFillBits;
if (numFillBits < 0) {
/* Parsing went wrong */