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

am: f462745e36

Change-Id: I48e9385dcb919b7777545aee8a04960d2461f6e9
This commit is contained in:
Ray Essick 2019-01-02 19:42:25 -08:00 • committed by android-build-merger
commit 174165dd89

View file

@ -2244,6 +2244,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)
@ -2352,6 +2355,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;