highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit beefafda63)
This commit is contained in:
Laurent Aimar
2011-09-07 23:12:32 +02:00
committed by Michael Niedermayer
parent e6df35b3be
commit 90edd5df3d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/wavpack.c
View File

@@ -385,7 +385,7 @@ static inline int wv_get_value_integer(WavpackFrameContext *s, uint32_t *crc, in
if(s->extra_bits){ if(s->extra_bits){
S <<= s->extra_bits; S <<= s->extra_bits;
if(s->got_extra_bits){ if(s->got_extra_bits && get_bits_left(&s->gb_extra_bits) >= s->extra_bits){
S |= get_bits(&s->gb_extra_bits, s->extra_bits); S |= get_bits(&s->gb_extra_bits, s->extra_bits);
*crc = *crc * 9 + (S&0xffff) * 3 + ((unsigned)S>>16); *crc = *crc * 9 + (S&0xffff) * 3 + ((unsigned)S>>16);
} }