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

lzw: prevent buffer overreads.

Browse Source 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit ddcf67c8a51c67b122a826d8b5819e96d591d813)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Ronald S. Bultje 2012-03-28 17:06:00 -07:00 committed by Reinhard Tartler
parent e711ccee4d
commit 562c6a7bf1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/lzw.c
View File

@ -101,9 +101,14 @@ void ff_lzw_decode_tail(LZWState *p)
struct LZWState *s = (struct LZWState *)p; struct LZWState *s = (struct LZWState *)p;
if(s->mode == FF_LZW_GIF) { if(s->mode == FF_LZW_GIF) {
while(s->pbuf < s->ebuf && s->bs>0){ while (s->bs > 0) {
s->pbuf += s->bs; if (s->pbuf + s->bs >= s->ebuf) {
s->bs = *s->pbuf++; s->pbuf = s->ebuf;
break;
} else {
s->pbuf += s->bs;
s->bs = *s->pbuf++;
}
} }
}else }else
s->pbuf= s->ebuf; s->pbuf= s->ebuf;