dvbsubdec: check against buffer overreads
authorJanne Grunau <janne-ffmpeg@jannau.net>
Wed, 9 Feb 2011 22:23:22 +0000 (23:23 +0100)
committerJanne Grunau <janne-ffmpeg@jannau.net>
Thu, 10 Feb 2011 20:37:31 +0000 (21:37 +0100)
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
libavcodec/dvbsubdec.c

index 401144f..4573713 100644 (file)
@@ -1423,13 +1423,15 @@ static int dvbsub_decode(AVCodecContext *avctx,
 
 #endif
 
-    if (buf_size <= 2 || *buf != 0x0f)
+    if (buf_size <= 6 || *buf != 0x0f) {
+        av_dlog(avctx, "incomplete or broken packet");
         return -1;
+    }
 
     p = buf;
     p_end = buf + buf_size;
 
-    while (p < p_end && *p == 0x0f) {
+    while (p_end - p >= 6 && *p == 0x0f) {
         p += 1;
         segment_type = *p++;
         page_id = AV_RB16(p);
@@ -1437,6 +1439,11 @@ static int dvbsub_decode(AVCodecContext *avctx,
         segment_length = AV_RB16(p);
         p += 2;
 
+        if (p_end - p < segment_length) {
+            av_dlog(avctx, "incomplete or broken packet");
+            return -1;
+        }
+
         if (page_id == ctx->composition_id || page_id == ctx->ancillary_id ||
             ctx->composition_id == -1 || ctx->ancillary_id == -1) {
             switch (segment_type) {