jv demuxer: prevent video packet size overflow
authorPeter Ross <pross@xvid.org>
Sun, 13 Mar 2011 05:15:38 +0000 (16:15 +1100)
committerRonald S. Bultje <rsbultje@gmail.com>
Mon, 14 Mar 2011 12:06:19 +0000 (08:06 -0400)
In the event of overflow, the JV_PADDING state will avio_skip over
any overflow bytes (using JVFrame.total_size).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
libavformat/jvdec.c

index 314a341..9235e51 100644 (file)
@@ -116,6 +116,8 @@ static int read_header(AVFormatContext *s,
         jvf->audio_size = avio_rl32(pb);
         jvf->video_size = avio_rl32(pb);
         jvf->palette_size = avio_r8(pb) ? 768 : 0;
+        jvf->video_size = FFMIN(FFMAX(jvf->video_size, 0),
+                                INT_MAX - JV_PREAMBLE_SIZE - jvf->palette_size);
         if (avio_r8(pb))
              av_log(s, AV_LOG_WARNING, "unsupported audio codec\n");
         jvf->video_type = avio_r8(pb);