generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Take into account real number of colours when reading BMP palette.

Browse Source 
This fixes issue 1408

Originally committed as revision 20007 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2009-09-24 05:24:46 +00:00
parent 20c6837880
commit 22da339f5d
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/bmp.c
View File

@ -231,12 +231,23 @@ 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;
if(ihsize >= 36){
int t;
buf = buf0 + 46;
t = bytestream_get_le32(&buf);
if(t < 0 || t > (1 << depth)){
av_log(avctx, AV_LOG_ERROR, "Incorrect number of colors - %X for bitdepth %d\n", t, depth);
}else if(t){
colors = t;
}
}
buf = buf0 + 14 + ihsize; //palette location buf = buf0 + 14 + ihsize; //palette location
if((hsize-ihsize-14)>>depth < 4){ // OS/2 bitmap, 3 bytes per palette entry if((hsize-ihsize-14) < (colors << 2)){ // OS/2 bitmap, 3 bytes per palette entry
for(i = 0; i < (1 << depth); i++) for(i = 0; i < colors; i++)
((uint32_t*)p->data[1])[i] = bytestream_get_le24(&buf); ((uint32_t*)p->data[1])[i] = bytestream_get_le24(&buf);
}else{ }else{
for(i = 0; i < (1 << depth); i++) for(i = 0; i < colors; i++)
((uint32_t*)p->data[1])[i] = bytestream_get_le32(&buf); ((uint32_t*)p->data[1])[i] = bytestream_get_le32(&buf);
} }
buf = buf0 + hsize; buf = buf0 + hsize;