diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-29 13:02:27 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-01-07 09:43:58 +0100 |
| commit | d92c908e235a0632176b1b037860c73bcd2ed97f (patch) | |
| tree | e9f14a3279dd255e9fe5de1b7590381fdd20b4e2 | |
| parent | cb4a101fbe2729f77d636c264b11789d251bfe84 (diff) | |
| download | ffmpeg-d92c908e235a0632176b1b037860c73bcd2ed97f.tar.gz | |
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@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit d1d99e3befea5d411ac3aae72dbdecce94f8b547)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavcodec/pcx.c
(cherry picked from commit 7e350b7ddd19af856b55634233d609e29baab646)
| -rw-r--r-- | libavcodec/pcx.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index 0e8201267a..8419e5cd76 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -183,7 +183,13 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, } else if (nplanes == 1 && bits_per_pixel == 8) { const uint8_t *palstart = bufstart + buf_size - 769; - for (y=0; y<h; y++, ptr+=stride) { + 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); memcpy(ptr, scanline, w); |