From 416ea171edd2998c5af40bf67cedf49ea43fc28b Mon Sep 17 00:00:00 2001 From: Rajat Kumar Date: Mon, 11 Feb 2019 14:47:12 +0530 Subject: [PATCH] Fix for array out of bound access in aac decoding pstr_drc_dec->is_longblock once initialized was never used, so this section of code is redundant. Hence removed. Bug:124022176 Test: vendor+poc Change-Id: I30f785764a7031b546f01803720dbfccba75d023 --- decoder/ixheaacd_aacdecoder.c | 10 ---------- decoder/ixheaacd_drc_data_struct.h | 1 - 2 files changed, 11 deletions(-) diff --git a/decoder/ixheaacd_aacdecoder.c b/decoder/ixheaacd_aacdecoder.c index bd25a91..19770ad 100644 --- a/decoder/ixheaacd_aacdecoder.c +++ b/decoder/ixheaacd_aacdecoder.c @@ -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) { for (ch = 0; ch < channel; ch++) { aac_dec_handle->ptr_aac_dec_static_channel_info[ch]->ltp_lag = diff --git a/decoder/ixheaacd_drc_data_struct.h b/decoder/ixheaacd_drc_data_struct.h index 9e1980b..faf9775 100644 --- a/decoder/ixheaacd_drc_data_struct.h +++ b/decoder/ixheaacd_drc_data_struct.h @@ -76,7 +76,6 @@ typedef struct { UWORD8 max_audio_channels; UWORD8 length_history; UWORD8 num_drc_elements; - WORD32 is_longblock[MAX_BS_ELEMENT]; WORD32 state; WORD32 target_ref_level; WORD32 prog_ref_level;