RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tiffdec: Fix runend handling 

Fixes Ticket1999

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-24 04:35:12 +01:00
parent d4d8d4f786
commit 98b7a50a21
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/faxcompr.c
View File

@ -163,8 +163,6 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
int run_off = *ref++; int run_off = *ref++;
unsigned int offs=0, run= 0; unsigned int offs=0, run= 0;
runend--; // for the last written 0
while(offs < width){ while(offs < width){
int cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1); int cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1);
if(cmode == -1){ if(cmode == -1){
@ -234,7 +232,13 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
} }
} }
*runs++ = saved_run; *runs++ = saved_run;
if (saved_run) {
if(runs >= runend){
av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
return -1;
}
*runs++ = 0; *runs++ = 0;
}
return 0; return 0;
} }