mirrors/flac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libFLAC/bitreader.c: Fix shift invoking undefined behaviour

Browse Source 
Credit: Oss-Fuzz
Issue: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16464
Testcase: fuzzer_decoder-5663276452544512
This commit is contained in:
Erik de Castro Lopo 2019-08-25 17:50:36 +10:00
parent 09f47c00e1
commit 8147ee7ea2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libFLAC/bitreader.c
View File

@ -119,8 +119,10 @@ static inline void crc16_update_word_(FLAC__BitReader *br, brword word)
{
register uint32_t crc = br->read_crc16;
for( ; br->crc16_align < FLAC__BITS_PER_WORD; br->crc16_align += 8)
crc = FLAC__CRC16_UPDATE((uint32_t)((word >> (FLAC__BITS_PER_WORD-8-br->crc16_align)) & 0xff), crc);
for ( ; br->crc16_align < FLAC__BITS_PER_WORD ; br->crc16_align += 8) {
uint32_t shift = FLAC__BITS_PER_WORD - 8 - br->crc16_align ;
crc = FLAC__CRC16_UPDATE ((uint32_t) (shift < FLAC__BITS_PER_WORD ? (word >> shift) & 0xff : 0), crc);
}
br->read_crc16 = crc;
br->crc16_align = 0;