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

Merge cherrypicks of [7068682, 7066360, 7066361, 7066362, 7068985, 7068986, 7068987, 7068800, 7068004] into pi-qpr3-b-release 

Change-Id: I779161184ff3f9875b815efe88c9d12e046879e8
This commit is contained in:
android-build-team Robot 2019-04-16 06:06:05 +00:00
parent 69514bb308 f996972c32
commit d1918a47fe
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;
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 (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;
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) {