asfdec: fix assert failure on invalid files
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 24 Apr 2011 04:21:30 +0000 (07:21 +0300)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 May 2011 14:09:39 +0000 (16:09 +0200)
Add an extra size validity check in asf_read_frame_header(). Without
this asf->packet_size_left may become negative, which triggers an
assertion failure later.

libavformat/asfdec.c

index 0641688..a21af77 100644 (file)
@@ -842,6 +842,10 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){
         av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", asf->packet_replic_size);
         return -1;
     }
+    if (rsize > asf->packet_size_left) {
+        av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n");
+        return -1;
+    }
     if (asf->packet_flags & 0x01) {
         DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal
         if(asf->packet_frag_size > asf->packet_size_left - rsize){