aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPDec/src/tpdec_asc.cpp
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2018-05-24 07:24:02 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-24 07:24:02 -0700
commit634d4f789cc713fd374db7b9dbcaeb1d89bf2d5e (patch)
tree4f088dbfd47d22d3f90ebcbcf054a26d6e69bdce /libMpegTPDec/src/tpdec_asc.cpp
parent57d474b424be58783e7abba469d2f3d800094967 (diff)
parenta4d1f0ad52e2cf6f168d2193216602f52033fc27 (diff)
downloadfdk-aac-634d4f789cc713fd374db7b9dbcaeb1d89bf2d5e.tar.gz
fdk-aac-634d4f789cc713fd374db7b9dbcaeb1d89bf2d5e.tar.bz2
fdk-aac-634d4f789cc713fd374db7b9dbcaeb1d89bf2d5e.zip
FDKv2 ubsan patches
am: a4d1f0ad52 Change-Id: Ic489768836aae6a9b9cab9e866ecc8b21d819368
Diffstat (limited to 'libMpegTPDec/src/tpdec_asc.cpp')
-rw-r--r--libMpegTPDec/src/tpdec_asc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libMpegTPDec/src/tpdec_asc.cpp b/libMpegTPDec/src/tpdec_asc.cpp
index b7fd2a1..b0f1c6a 100644
--- a/libMpegTPDec/src/tpdec_asc.cpp
+++ b/libMpegTPDec/src/tpdec_asc.cpp
@@ -1618,7 +1618,7 @@ static TRANSPORTDEC_ERROR configExtension(CSUsacConfig *usc,
usacConfigExtLength = (int)escapedValue(hBs, 4, 8, 16);
/* Start bit position of config extension */
- nbits = FDKgetValidBits(hBs);
+ nbits = (INT)FDKgetValidBits(hBs);
/* Return an error in case the bitbuffer fill level is too low. */
if (nbits < usacConfigExtLength * 8) {
@@ -1650,7 +1650,7 @@ static TRANSPORTDEC_ERROR configExtension(CSUsacConfig *usc,
/* Skip remaining bits. If too many bits were parsed, assume error. */
usacConfigExtLength =
- 8 * usacConfigExtLength - (nbits - FDKgetValidBits(hBs));
+ 8 * usacConfigExtLength - (nbits - (INT)FDKgetValidBits(hBs));
if (usacConfigExtLength < 0) {
return TRANSPORTDEC_PARSE_ERROR;
}