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

Merge "Fix for oobw in impd_parse_drc_instructions_uni_drc()" into pi-dev

Browse source
This commit is contained in:
Ray Essick 2019-01-03 03:23:27 +00:00 • committed by Android (Google) Code Review
commit e0c41aae88
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
decoder/drc_src/impd_drc_static_payload.c
View file

@ -2239,6 +2239,9 @@ impd_parse_drc_instructions_uni_drc(
str_drc_instruction_str->num_drc_ch_groups = g;
}
if (str_drc_instruction_str->num_drc_ch_groups >
min(CHANNEL_GROUP_COUNT_MAX, MAX_CHANNEL_COUNT))
return UNEXPECTED_ERROR;
for (g = 0; g < str_drc_instruction_str->num_drc_ch_groups; g++) {
WORD32 set =
(str_drc_instruction_str->drc_set_effect & EFFECT_BIT_DUCK_OTHER)
@ -2344,6 +2347,10 @@ impd_parse_drc_instructions_uni_drc(
}
str_drc_instruction_str->num_drc_ch_groups = g;
if (str_drc_instruction_str->num_drc_ch_groups >
min(CHANNEL_GROUP_COUNT_MAX, MAX_CHANNEL_COUNT))
return UNEXPECTED_ERROR;
for (g = 0; g < str_drc_instruction_str->num_drc_ch_groups; g++) {
WORD32 set, band_count;