From d1d99e3befea5d411ac3aae72dbdecce94f8b547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sun, 29 Sep 2013 13:02:27 +0300 Subject: [PATCH] pcx: Check the packet size before assuming it fits a palette MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes reads out of bounds. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö --- libavcodec/pcx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index fd8bb2a6cb..837f268efa 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);