]> git.sesse.net Git - ffmpeg/commitdiff
fraps: check for overread
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Nov 2011 21:42:50 +0000 (22:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Nov 2011 23:06:08 +0000 (00:06 +0100)
Fixeds Ticket619

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/fraps.c
tests/ref/fate/fraps-v5

index d6f9a554cf9e3dc03401190955ba8fa737139f74..0844fa793961595426b74fd9fc41c96d25444b83 100644 (file)
@@ -114,6 +114,8 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w,
             else if(Uoff) dst[i] += 0x80;
         }
         dst += stride;
+        if(get_bits_left(&gb) < 0)
+            return -1;
     }
     free_vlc(&vlc);
     return 0;
index 05fa9da37bcad102338a85ed85fa34f30233b47a..3fe1c49329b9e1bf8a0e4d1a2cbe38ddfddc9972 100644 (file)
@@ -56,4 +56,3 @@
 0, 165000, 145152, 0x80448031
 0, 168000, 145152, 0xe3b1fbf7
 0, 171000, 145152, 0xa00395a4
-0, 174000, 145152, 0xdf3b4fce