[SCM] libav/experimental: hopefully fixing unreprodceable segfault when overreading the end if error_resilience==-1 (it didnt overread here though)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 159d10fc2c72d1c4e7e2c8161810965505a0ad61
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Aug 4 19:28:27 2002 +0000

    hopefully fixing unreprodceable segfault when overreading the end if error_resilience==-1 (it didnt overread here though)
    
    Originally committed as revision 841 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 74c1699..1c53b8d 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -1859,7 +1859,8 @@ static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
         if (i > 62){
             i-= 192;
             if(i&(~63)){
-                if((i+192 == 64 && level/qmul==-1) || s->error_resilience<0){
+                const int left= s->gb.size*8 - get_bits_count(&s->gb);
+                if(((i+192 == 64 && level/qmul==-1) || s->error_resilience<0) && left>=0){
                     fprintf(stderr, "ignoring overflow at %d %d\n", s->mb_x, s->mb_y);
                     break;
                 }else{

-- 
Libav/FFmpeg packaging