highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/tiff: check remaining packet size for strips

Browse Source 
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>
This commit is contained in:
Michael Niedermayer
2018-10-02 03:04:50 +02:00
parent dcbd89e000
commit c905840e8c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/tiff.c
View File

@@ -1303,6 +1303,7 @@ static int decode_frame(AVCodecContext *avctx,
planes = s->planar ? s->bppcount : 1; planes = s->planar ? s->bppcount : 1;
for (plane = 0; plane < planes; plane++) { for (plane = 0; plane < planes; plane++) {
int remaining = avpkt->size;
stride = p->linesize[plane]; stride = p->linesize[plane];
dst = p->data[plane]; dst = p->data[plane];
for (i = 0; i < s->height; i += s->rps) { for (i = 0; i < s->height; i += s->rps) {
@@ -1318,10 +1319,11 @@ static int decode_frame(AVCodecContext *avctx,
else else
soff = s->stripoff; 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"); av_log(avctx, AV_LOG_ERROR, "Invalid strip size/offset\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
remaining -= ssize;
if ((ret = tiff_unpack_strip(s, p, dst, stride, avpkt->data + soff, ssize, i, if ((ret = tiff_unpack_strip(s, p, dst, stride, avpkt->data + soff, ssize, i,
FFMIN(s->rps, s->height - i))) < 0) { FFMIN(s->rps, s->height - i))) < 0) {
if (avctx->err_recognition & AV_EF_EXPLODE) if (avctx->err_recognition & AV_EF_EXPLODE)