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

Fix for stack buffer overflow in drc loudness control

Browse source 
am: 851d0d122a

Change-Id: I283995d5aa220299dc9dc47b8b4961ba5cc7e3f3
This commit is contained in:
Ramesh Katuri 2018-10-30 15:16:08 -07:00 • committed by android-build-merger
commit 8a2678ef55
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
decoder/drc_src/impd_drc_loudness_control.c
View file

@ -28,7 +28,6 @@
#include "impd_drc_selection_process.h" #include "impd_drc_selection_process.h"
#include "impd_drc_filter_bank.h" #include "impd_drc_filter_bank.h"
#include "impd_drc_rom.h" #include "impd_drc_rom.h"
WORD32 impd_signal_peak_level_info( WORD32 impd_signal_peak_level_info(
ia_drc_config* pstr_drc_config, ia_drc_config* pstr_drc_config,
ia_drc_loudness_info_set_struct* pstr_loudness_info, ia_drc_loudness_info_set_struct* pstr_loudness_info,
@ -717,8 +716,11 @@ WORD32 impd_init_loudness_control(
loudness_normalization_gain_db[k] = 0.0f; loudness_normalization_gain_db[k] = 0.0f;
} }
} }
if (k >= MAX_NUM_COMPRESSION_EQ) return UNEXPECTED_ERROR;
eq_set_id[k] = 0; eq_set_id[k] = 0;
loudness[k] = UNDEFINED_LOUDNESS_VALUE; loudness[k] = UNDEFINED_LOUDNESS_VALUE;
loudness_normalization_gain_db[k] = 0.0f; loudness_normalization_gain_db[k] = 0.0f;
k++; k++;

3
decoder/drc_src/impd_drc_selection_process_drcset_selection.c
View file

@ -1414,10 +1414,11 @@ WORD32 impd_select_drc_set(ia_drc_sel_pro_struct* pstr_drc_uni_sel_proc,
} }
while (!selection_candidate_count) { while (!selection_candidate_count) {
impd_drc_set_preselection( err = impd_drc_set_preselection(
pstr_drc_sel_proc_params_struct, pstr_drc_config, pstr_loudness_info, pstr_drc_sel_proc_params_struct, pstr_drc_config, pstr_loudness_info,
restrict_to_drc_with_album_loudness, pstr_drc_uni_sel_proc, restrict_to_drc_with_album_loudness, pstr_drc_uni_sel_proc,
&selection_candidate_count, selection_candidate_info); &selection_candidate_count, selection_candidate_info);
if (err) return err;
if (selection_candidate_count == 0) { if (selection_candidate_count == 0) {
if (restrict_to_drc_with_album_loudness == 1) { if (restrict_to_drc_with_album_loudness == 1) {