| Message ID | 20181002010452.12356-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Headers | show |
On 10/2/18, Michael Niedermayer <michael@niedermayer.cc> wrote: > Fixes: Timeout > Fixes: > 10280/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5676217211027456 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/tiff.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > LGTM
On Tue, Oct 02, 2018 at 09:53:16AM +0200, Paul B Mahol wrote: > On 10/2/18, Michael Niedermayer <michael@niedermayer.cc> wrote: > > Fixes: Timeout > > Fixes: > > 10280/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5676217211027456 > > > > Found-by: continuous fuzzing process > > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/tiff.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > LGTM applied thx [...]
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index cfe0c27714..b537ec06a5 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1303,6 +1303,7 @@ static int decode_frame(AVCodecContext *avctx, planes = s->planar ? s->bppcount : 1; for (plane = 0; plane < planes; plane++) { + int remaining = avpkt->size; stride = p->linesize[plane]; dst = p->data[plane]; for (i = 0; i < s->height; i += s->rps) { @@ -1318,10 +1319,11 @@ static int decode_frame(AVCodecContext *avctx, else soff = s->stripoff; - if (soff > avpkt->size || ssize > avpkt->size - soff) { + if (soff > avpkt->size || ssize > avpkt->size - soff || ssize > remaining) { av_log(avctx, AV_LOG_ERROR, "Invalid strip size/offset\n"); return AVERROR_INVALIDDATA; } + remaining -= ssize; if ((ret = tiff_unpack_strip(s, p, dst, stride, avpkt->data + soff, ssize, i, FFMIN(s->rps, s->height - i))) < 0) { if (avctx->err_recognition & AV_EF_EXPLODE)
Fixes: Timeout Fixes: 10280/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5676217211027456 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/tiff.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)