Browse Source

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

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit beefafda63)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
tags/n0.8.4
Laurent Aimar Anton Khirnov 14 years ago
parent
commit
a652bb2857
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/wavpack.c

+ 1
- 1
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){
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);
*crc = *crc * 9 + (S&0xffff) * 3 + ((unsigned)S>>16);
}


Loading…
Cancel
Save