See patch.

-- 
fenrir
>From 1b8b4e2bee998dcc65e24cb1cc94879bdc8845ed Mon Sep 17 00:00:00 2001
From: Laurent Aimar <[email protected]>
Date: Wed, 7 Sep 2011 23:12:32 +0200
Subject: [PATCH] Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.

---
 libavcodec/wavpack.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index f43819c..f6d30b0 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -400,7 +400,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);
         }
-- 
1.7.2.5

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to