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

Return on negative soff sizes, fixes issue 2515.

Browse Source 
Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26288 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Daniel Kang 2011-01-09 19:29:39 +00:00 committed by Carl Eugen Hoyos
parent 31561a98ae
commit a4db272a92
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/tiff.c
View File

@ -540,6 +540,10 @@ static int decode_frame(AVCodecContext *avctx,
soff = tget(&s->stripdata, s->sot, s->le);
}else
soff = s->stripoff;
if (soff < 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid stripoff: %d\n", soff);
return AVERROR(EINVAL);
}
if(tiff_unpack_strip(s, dst, stride, orig_buf + soff, ssize, FFMIN(s->rps, s->height - i)) < 0)
break;
dst += s->rps * stride;