4xm: Add a check in decode_i_frame to prevent buffer overreads
authorShitiz Garg <mail@dragooon.net>
Wed, 14 Dec 2011 12:59:21 +0000 (18:29 +0530)
committerJanne Grunau <janne-libav@jannau.net>
Thu, 22 Dec 2011 22:26:55 +0000 (23:26 +0100)
Fixes bugzilla #135

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
libavcodec/4xm.c

index ba8bb4a..1c49ff1 100644 (file)
@@ -653,9 +653,18 @@ static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length){
     uint16_t *dst= (uint16_t*)f->current_picture.data[0];
     const int stride= f->current_picture.linesize[0]>>1;
     const unsigned int bitstream_size= AV_RL32(buf);
-    const int token_count av_unused = AV_RL32(buf + bitstream_size + 8);
-    unsigned int prestream_size= 4*AV_RL32(buf + bitstream_size + 4);
-    const uint8_t *prestream= buf + bitstream_size + 12;
+    int token_count av_unused;
+    unsigned int prestream_size;
+    const uint8_t *prestream;
+
+    if (length < bitstream_size + 12) {
+        av_log(f->avctx, AV_LOG_ERROR, "packet size too small\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    token_count    = AV_RL32(buf + bitstream_size + 8);
+    prestream_size = 4 * AV_RL32(buf + bitstream_size + 4);
+    prestream      = buf + bitstream_size + 12;
 
     if(prestream_size + bitstream_size + 12 != length
        || bitstream_size > (1<<26)