fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Add sanity check in huff_decode()" 

am: 3942213f19

Change-Id: I33db3f469583b7490860fb5f79189da6c5519085
This commit is contained in:
Jean-Michel Trivi 2019-01-02 12:46:23 -08:00 committed by android-build-merger
parent 8bdeed59aa 3942213f19
commit 8d06f35f31
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libFDK/src/nlc_dec.cpp
View File

@ -647,6 +647,10 @@ static ERROR_t huff_decode(HANDLE_FDK_BITSTREAM strm, SCHAR* out_data_1,
} }
df_rest_flag_1 = num_val_1_int % 2; df_rest_flag_1 = num_val_1_int % 2;
if (df_rest_flag_1) num_val_1_int -= 1; if (df_rest_flag_1) num_val_1_int -= 1;
if (num_val_1_int < 0) {
err = HUFFDEC_NOTOK;
goto bail;
}
} }
if (out_data_2 != NULL) { if (out_data_2 != NULL) {
if (diff_type_2 == DIFF_FREQ) { if (diff_type_2 == DIFF_FREQ) {
@ -658,6 +662,10 @@ static ERROR_t huff_decode(HANDLE_FDK_BITSTREAM strm, SCHAR* out_data_1,
} }
df_rest_flag_2 = num_val_2_int % 2; df_rest_flag_2 = num_val_2_int % 2;
if (df_rest_flag_2) num_val_2_int -= 1; if (df_rest_flag_2) num_val_2_int -= 1;
if (num_val_2_int < 0) {
err = HUFFDEC_NOTOK;
goto bail;
}
} }
if (out_data_1 != NULL) { if (out_data_1 != NULL) {