Browse Source

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
tags/n1.0
Anton Khirnov 13 years ago
parent
commit
8b78c2969a
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      libavcodec/bmp.c

+ 3
- 3
libavcodec/bmp.c View File

@@ -228,9 +228,6 @@ static int bmp_decode_frame(AVCodecContext *avctx,
if(comp == BMP_RLE4 || comp == BMP_RLE8) if(comp == BMP_RLE4 || comp == BMP_RLE8)
memset(p->data[0], 0, avctx->height * p->linesize[0]); memset(p->data[0], 0, avctx->height * p->linesize[0]);


if(depth == 4 || depth == 8)
memset(p->data[1], 0, 1024);

if(height > 0){ if(height > 0){
ptr = p->data[0] + (avctx->height - 1) * p->linesize[0]; ptr = p->data[0] + (avctx->height - 1) * p->linesize[0];
linesize = -p->linesize[0]; linesize = -p->linesize[0];
@@ -241,6 +238,9 @@ static int bmp_decode_frame(AVCodecContext *avctx,


if(avctx->pix_fmt == PIX_FMT_PAL8){ if(avctx->pix_fmt == PIX_FMT_PAL8){
int colors = 1 << depth; int colors = 1 << depth;

memset(p->data[1], 0, 1024);

if(ihsize >= 36){ if(ihsize >= 36){
int t; int t;
buf = buf0 + 46; buf = buf0 + 46;


Loading…
Cancel
Save