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 impd_drc_get_gain" am: 7d0fd974c9 am: e6d24ebe23 am: e626d6d509 am: d9e5ecdcdb

Browse source 
Original change: 1425115

Change-Id: Ic376c6474dd6dd5b43350c1473a0a618a9939d9d
This commit is contained in:
Ray Essick 2020-09-30 03:38:56 +00:00 • committed by Automerger Merge Worker
commit e46656b338
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
decoder/drc_src/impd_drc_static_payload.c
View file

@ -1414,17 +1414,21 @@ impd_dec_gain_modifiers(ia_bit_buf_struct* it_bit_buff, WORD32 version,
impd_read_bits_buf(it_bit_buff, 1);
if (it_bit_buff->error) return it_bit_buff->error;
if (pstr_gain_modifiers->target_characteristic_left_present[b]) {
pstr_gain_modifiers->target_characteristic_left_index[b] =
impd_read_bits_buf(it_bit_buff, 4);
WORD32 tmp_index = impd_read_bits_buf(it_bit_buff, 4);
if (it_bit_buff->error) return it_bit_buff->error;
if (tmp_index >= SPLIT_CHARACTERISTIC_COUNT_MAX)
return (UNEXPECTED_ERROR);
pstr_gain_modifiers->target_characteristic_left_index[b] = tmp_index;
}
pstr_gain_modifiers->target_characteristic_right_present[b] =
impd_read_bits_buf(it_bit_buff, 1);
if (it_bit_buff->error) return it_bit_buff->error;
if (pstr_gain_modifiers->target_characteristic_right_present[b]) {
pstr_gain_modifiers->target_characteristic_right_index[b] =
impd_read_bits_buf(it_bit_buff, 4);
WORD32 tmp_index = impd_read_bits_buf(it_bit_buff, 4);
if (it_bit_buff->error) return it_bit_buff->error;
if (tmp_index >= SPLIT_CHARACTERISTIC_COUNT_MAX)
return (UNEXPECTED_ERROR);
pstr_gain_modifiers->target_characteristic_right_index[b] = tmp_index;
}
pstr_gain_modifiers->gain_scaling_flag[b] =
impd_read_bits_buf(it_bit_buff, 1);