Commit a4db272a authored by Daniel Kang's avatar Daniel Kang Committed by Carl Eugen Hoyos

Return on negative soff sizes, fixes issue 2515.

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

Originally committed as revision 26288 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 31561a98
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment