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

Fix for undefined shift in ixheaacd_read_scale_factor_data

Browse source 
These changes handle the Undefined-shift runtime error
reported because the value of read word was being shifted
by a value greater than 31.

Bug: ossFuzz:61676, 61679
Test: poc in bug
This commit is contained in:
Yash Patil 2023-09-11 18:48:11 +05:30
parent 6cd0c1410e
commit b32c803df9
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
decoder/ixheaacd_bitbuffer.c
View file

@ -178,6 +178,13 @@ VOID ixheaacd_aac_read_byte_corr1(UWORD8 **ptr_read_next, WORD32 *ptr_bit_pos,
v++;
}
}
if (bits_consumed > (31 - temp_bit_count)) {
if ((p_bit_buf_end != NULL) && (p_bit_buf_end < v)) {
bits_consumed = 31 - temp_bit_count;
}
}
*ptr_bit_pos = bits_consumed + temp_bit_count;
*ptr_read_next = v;
return;
@ -198,6 +205,13 @@ VOID ixheaacd_aac_read_byte_corr(UWORD8 **ptr_read_next, WORD32 *ptr_bit_pos,
} else {
bits_consumed += 8;
}
if (bits_consumed > 31) {
if (p_bit_buf_end < v) {
bits_consumed = 31;
}
}
*ptr_bit_pos = bits_consumed;
*ptr_read_next = v;
return;