diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-10-02 03:04:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-10-03 11:13:38 +0200 |
| commit | c905840e8c0a0d4bc3737879bfc038618ecba2b2 (patch) | |
| tree | 69b5961f2ae628795478ca98a847a803f026e277 /libavcodec/tiff.c | |
| parent | dcbd89e0008f54e0ea7865b0d5dd4b644ee7da18 (diff) | |
| download | ffmpeg-c905840e8c0a0d4bc3737879bfc038618ecba2b2.tar.gz | |
avcodec/tiff: check remaining packet size for strips
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
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 4 |
1 files changed, 3 insertions, 1 deletions
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) |