diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-09-16 08:33:09 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-01-04 07:43:21 +0100 |
| commit | d3e2f35f7addb6cb3a59aa823b716c8fa0b32b51 (patch) | |
| tree | 628bda49e0e5450f85710be8f54831cf788676e0 | |
| parent | e39fc137aeace9420690c264067c37ff516b4743 (diff) | |
| download | ffmpeg-d3e2f35f7addb6cb3a59aa823b716c8fa0b32b51.tar.gz | |
bmpdec: only initialize palette for pal8.
Gray8 is not considered to be paletted, so this would cause an invalid
write.
Fixes bug 367.
CC: libav-stable@libav.org
(cherry picked from commit 8b78c2969a5b7dca939d93bf525aa2bcd737b5d9)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/bmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index b7fee130bc..51947adad8 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -219,9 +219,6 @@ static int bmp_decode_frame(AVCodecContext *avctx, if(comp == BMP_RLE4 || comp == BMP_RLE8) memset(p->data[0], 0, avctx->height * p->linesize[0]); - if(depth == 4 || depth == 8) - memset(p->data[1], 0, 1024); - if(height > 0){ ptr = p->data[0] + (avctx->height - 1) * p->linesize[0]; linesize = -p->linesize[0]; @@ -232,6 +229,9 @@ static int bmp_decode_frame(AVCodecContext *avctx, if(avctx->pix_fmt == PIX_FMT_PAL8){ int colors = 1 << depth; + + memset(p->data[1], 0, 1024); + if(ihsize >= 36){ int t; buf = buf0 + 46; |