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

Fix for segv in ixheaacd_read_bits_buf am: 7a984f6ccc

Browse source 
Change-Id: Idfd24e44f0539ec417ef08e15970fda6ca243973
This commit is contained in:
Automerger Merge Worker 2020-03-06 00:08:50 +00:00
commit 10a4c714c2
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
decoder/ixheaacd_common_initfuncs.c
View file

@ -158,12 +158,13 @@ VOID ixheaacd_read_bidirection(ia_bit_buf_struct *it_bit_buff,
WORD32 ixheaacd_drc_offset) { WORD32 ixheaacd_drc_offset) {
if (ixheaacd_drc_offset != 0) { if (ixheaacd_drc_offset != 0) {
WORD32 byte_offset; WORD32 byte_offset;
if ((it_bit_buff->cnt_bits < 0) ||
it_bit_buff->cnt_bits = it_bit_buff->cnt_bits - ixheaacd_drc_offset; (it_bit_buff->cnt_bits - ixheaacd_drc_offset < 0) ||
if (it_bit_buff->cnt_bits < 0) { (it_bit_buff->cnt_bits - ixheaacd_drc_offset > it_bit_buff->size)) {
longjmp(*(it_bit_buff->xaac_jmp_buf), longjmp(*(it_bit_buff->xaac_jmp_buf),
IA_ENHAACPLUS_DEC_EXE_NONFATAL_INSUFFICIENT_INPUT_BYTES); IA_ENHAACPLUS_DEC_EXE_NONFATAL_INSUFFICIENT_INPUT_BYTES);
} }
it_bit_buff->cnt_bits = it_bit_buff->cnt_bits - ixheaacd_drc_offset;
it_bit_buff->bit_pos = it_bit_buff->bit_pos - ixheaacd_drc_offset; it_bit_buff->bit_pos = it_bit_buff->bit_pos - ixheaacd_drc_offset;
byte_offset = it_bit_buff->bit_pos >> 3; byte_offset = it_bit_buff->bit_pos >> 3;
it_bit_buff->bit_pos = it_bit_buff->bit_pos - (byte_offset << 3); it_bit_buff->bit_pos = it_bit_buff->bit_pos - (byte_offset << 3);