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 [7077329, 7077440, 7077330, 7077468, 7076852, 7077469, 7077580, 7077581, 7077582, 7074025, 7077706, 7077707, 7077708, 7077388, 7077583, 7077584, 7077585, 7077726, 7077727, 7077331, 7077332, 7077459, 7077709, 7077710, 7077711, 7077712, 7077460, 7077461, 7077333, 7077334, 7077696] into pi-qpr3-release 

Change-Id: If9c7aea7b790ca80bfe8aea213d90c3308e5f5c1
This commit is contained in:
android-build-team Robot 2019-04-16 22:42:01 +00:00
parent 69514bb308 da401d271e
commit 6c72374eea
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) {