[FFmpeg-cvslog] pcx: Check the packet size before assuming it fits a palette

Martin Storsjö git at videolan.org
Mon Sep 30 01:53:59 CEST 2013


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sun Sep 29 13:02:27 2013 +0300| [d1d99e3befea5d411ac3aae72dbdecce94f8b547] | committer: Martin Storsjö

pcx: Check the packet size before assuming it fits a palette

This fixes reads out of bounds.

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1d99e3befea5d411ac3aae72dbdecce94f8b547
---

 libavcodec/pcx.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c
index fd8bb2a..837f268 100644
--- a/libavcodec/pcx.c
+++ b/libavcodec/pcx.c
@@ -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);



More information about the ffmpeg-cvslog mailing list