wrapper/libxaac
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix for array out of bound access in aac decoding" into qt-dev

Browse source
This commit is contained in:
TreeHugger Robot 2019-04-05 00:19:56 +00:00 • committed by Android (Google) Code Review
commit e1aee2fa4a
2 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
decoder/ixheaacd_aacdecoder.c
View file

@ -760,16 +760,6 @@ WORD32 ixheaacd_aacdec_decodeframe(
} }
} }
if (p_obj_exhaacplus_dec->aac_config.ui_drc_enable) {
for (ch = 0; ch < num_ch; ch++) {
pstr_drc_dec->is_longblock[*ch_idx + ch] =
(aac_dec_handle->pstr_aac_dec_ch_info[ch]
->str_ics_info.window_sequence == EIGHT_SHORT_SEQUENCE)
? 0
: 1;
}
}
if (object_type == AOT_ER_AAC_LD) { if (object_type == AOT_ER_AAC_LD) {
for (ch = 0; ch < channel; ch++) { for (ch = 0; ch < channel; ch++) {
aac_dec_handle->ptr_aac_dec_static_channel_info[ch]->ltp_lag = aac_dec_handle->ptr_aac_dec_static_channel_info[ch]->ltp_lag =

1
decoder/ixheaacd_drc_data_struct.h
View file

@ -76,7 +76,6 @@ typedef struct {
UWORD8 max_audio_channels; UWORD8 max_audio_channels;
UWORD8 length_history; UWORD8 length_history;
UWORD8 num_drc_elements; UWORD8 num_drc_elements;
WORD32 is_longblock[MAX_BS_ELEMENT];
WORD32 state; WORD32 state;
WORD32 target_ref_level; WORD32 target_ref_level;
WORD32 prog_ref_level; WORD32 prog_ref_level;