diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-09-06 14:45:44 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-06 14:45:44 -0700 |
| commit | 8f5c6c2b212bf666d7f77dda07ebc5e3b7cdf991 (patch) | |
| tree | 524ff0c0bb2aeea95e4aa6433c12f84477e4ca86 /libAACdec | |
| parent | 983a134adb0035a856d578e69d0c25c301c312f9 (diff) | |
| parent | a083f27afba1da9e8fcdbd1792df435393e37fe8 (diff) | |
| download | fdk-aac-8f5c6c2b212bf666d7f77dda07ebc5e3b7cdf991.tar.gz fdk-aac-8f5c6c2b212bf666d7f77dda07ebc5e3b7cdf991.tar.bz2 fdk-aac-8f5c6c2b212bf666d7f77dda07ebc5e3b7cdf991.zip | |
Merge "Break audio element loop in case element_count becomes too large." into pi-dev am: 4d801e44ba
am: a083f27afb
Change-Id: I08e08b06d45c782f7cea15b06d370a0ef9920db2
Diffstat (limited to 'libAACdec')
| -rw-r--r-- | libAACdec/src/aacdecoder.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp index 2a228c8..2f43fc0 100644 --- a/libAACdec/src/aacdecoder.cpp +++ b/libAACdec/src/aacdecoder.cpp @@ -2519,8 +2519,14 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( if (!(self->flags[0] & (AC_USAC | AC_RSVD50 | AC_RSV603DA | AC_ELD | AC_SCALABLE | AC_ER))) type = (MP4_ELEMENT_ID)FDKreadBits(bs, 3); - else + else { + if (element_count >= (3 * ((8) * 2) + (((8) * 2)) / 2 + 4 * (1) + 1)) { + self->frameOK = 0; + ErrorStatus = AAC_DEC_PARSE_ERROR; + break; + } type = self->elements[element_count]; + } if ((self->flags[streamIndex] & (AC_USAC | AC_RSVD50) && element_count == 0) || @@ -2564,6 +2570,11 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( case ID_USAC_SCE: case ID_USAC_CPE: case ID_USAC_LFE: + if (element_count >= (3 * ((8) * 2) + (((8) * 2)) / 2 + 4 * (1) + 1)) { + self->frameOK = 0; + ErrorStatus = AAC_DEC_PARSE_ERROR; + break; + } el_channels = CAacDecoder_GetELChannels( type, self->usacStereoConfigIndex[element_count]); @@ -2795,12 +2806,24 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( } break; case ID_EXT: + if (element_count >= (3 * ((8) * 2) + (((8) * 2)) / 2 + 4 * (1) + 1)) { + self->frameOK = 0; + ErrorStatus = AAC_DEC_PARSE_ERROR; + break; + } + ErrorStatus = aacDecoder_ParseExplicitMpsAndSbr( self, bs, previous_element, previous_element_index, element_count, el_cnt); break; case ID_USAC_EXT: { + if ((element_count - element_count_prev_streams) >= + TP_USAC_MAX_ELEMENTS) { + self->frameOK = 0; + ErrorStatus = AAC_DEC_PARSE_ERROR; + break; + } /* parse extension element payload q.v. rsv603daExtElement() ISO/IEC DIS 23008-3 Table 30 or UsacExElement() ISO/IEC FDIS 23003-3:2011(E) Table 21 |