diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-17 03:11:49 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-17 03:11:49 +0000 |
| commit | 56b78e9be81bd98878772b46510c771a5036b70d (patch) | |
| tree | 8b52c5f90cb1e600434cb98198025c7b2afa37b6 /libMpegTPDec/src/tpdec_latm.cpp | |
| parent | dcf27337e1865276b5cf73dc42019b48b5687372 (diff) | |
| parent | 2152ae1a5ef0511e0b38a981745eb910f2af9bca (diff) | |
| download | fdk-aac-56b78e9be81bd98878772b46510c771a5036b70d.tar.gz fdk-aac-56b78e9be81bd98878772b46510c771a5036b70d.tar.bz2 fdk-aac-56b78e9be81bd98878772b46510c771a5036b70d.zip | |
Snap for 5945950 from 2152ae1a5ef0511e0b38a981745eb910f2af9bca to rvc-release
Change-Id: I4945162a10785a18df685897114d3715d75e807d
Diffstat (limited to 'libMpegTPDec/src/tpdec_latm.cpp')
| -rw-r--r-- | libMpegTPDec/src/tpdec_latm.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libMpegTPDec/src/tpdec_latm.cpp b/libMpegTPDec/src/tpdec_latm.cpp index 2edf055..3b71db8 100644 --- a/libMpegTPDec/src/tpdec_latm.cpp +++ b/libMpegTPDec/src/tpdec_latm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -367,10 +367,10 @@ TRANSPORTDEC_ERROR CLatmDemux_ReadStreamMuxConfig( } if (pLatmDemux->m_AudioMuxVersion == 1) { FDK_BITSTREAM tmpBs; - UINT ascLen = 0; + INT ascLen = 0; ascLen = CLatmDemux_GetValue(bs); /* The ascLen could be wrong, so check if validBits<=bufBits*/ - if (ascLen > FDKgetValidBits(bs)) { + if (ascLen < 0 || ascLen > (INT)FDKgetValidBits(bs)) { ErrorStatus = TRANSPORTDEC_PARSE_ERROR; goto bail; } |