pcx: Check the packet size before assuming it fits a palette
authorMartin Storsjö <martin@martin.st>
Sun, 29 Sep 2013 10:02:27 +0000 (13:02 +0300)
committerMartin Storsjö <martin@martin.st>
Sun, 29 Sep 2013 17:03:12 +0000 (20:03 +0300)
This fixes reads out of bounds.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/pcx.c

index fd8bb2a..837f268 100644 (file)
@@ -169,6 +169,12 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     } else if (nplanes == 1 && bits_per_pixel == 8) {
         const uint8_t *palstart = bufstart + buf_size - 769;
 
+        if (buf_size < 769) {
+            av_log(avctx, AV_LOG_ERROR, "File is too short\n");
+            ret = buf_size;
+            goto end;
+        }
+
         for (y = 0; y < h; y++, ptr += stride) {
             buf = pcx_rle_decode(buf, buf_end,
                                  scanline, bytes_per_scanline, compressed);