Commit 90ac0e5f authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/tiff: Limit filtering to decoded data

Fixes: Timeout
Fixes: 11068/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5698456681709568

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegReviewed-by: 's avatarTomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 46c5693e
...@@ -1421,6 +1421,7 @@ again: ...@@ -1421,6 +1421,7 @@ again:
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; int remaining = avpkt->size;
int decoded_height;
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) {
...@@ -1448,6 +1449,8 @@ again: ...@@ -1448,6 +1449,8 @@ again:
break; break;
} }
} }
decoded_height = FFMIN(i, s->height);
if (s->predictor == 2) { if (s->predictor == 2) {
if (s->photometric == TIFF_PHOTOMETRIC_YCBCR) { if (s->photometric == TIFF_PHOTOMETRIC_YCBCR) {
av_log(s->avctx, AV_LOG_ERROR, "predictor == 2 with YUV is unsupported"); av_log(s->avctx, AV_LOG_ERROR, "predictor == 2 with YUV is unsupported");
...@@ -1464,7 +1467,7 @@ again: ...@@ -1464,7 +1467,7 @@ again:
s->avctx->pix_fmt == AV_PIX_FMT_YA16LE || s->avctx->pix_fmt == AV_PIX_FMT_YA16LE ||
s->avctx->pix_fmt == AV_PIX_FMT_GBRP16LE || s->avctx->pix_fmt == AV_PIX_FMT_GBRP16LE ||
s->avctx->pix_fmt == AV_PIX_FMT_GBRAP16LE) { s->avctx->pix_fmt == AV_PIX_FMT_GBRAP16LE) {
for (i = 0; i < s->height; i++) { for (i = 0; i < decoded_height; i++) {
for (j = soff; j < ssize; j += 2) for (j = soff; j < ssize; j += 2)
AV_WL16(dst + j, AV_RL16(dst + j) + AV_RL16(dst + j - soff)); AV_WL16(dst + j, AV_RL16(dst + j) + AV_RL16(dst + j - soff));
dst += stride; dst += stride;
...@@ -1475,13 +1478,13 @@ again: ...@@ -1475,13 +1478,13 @@ again:
s->avctx->pix_fmt == AV_PIX_FMT_YA16BE || s->avctx->pix_fmt == AV_PIX_FMT_YA16BE ||
s->avctx->pix_fmt == AV_PIX_FMT_GBRP16BE || s->avctx->pix_fmt == AV_PIX_FMT_GBRP16BE ||
s->avctx->pix_fmt == AV_PIX_FMT_GBRAP16BE) { s->avctx->pix_fmt == AV_PIX_FMT_GBRAP16BE) {
for (i = 0; i < s->height; i++) { for (i = 0; i < decoded_height; i++) {
for (j = soff; j < ssize; j += 2) for (j = soff; j < ssize; j += 2)
AV_WB16(dst + j, AV_RB16(dst + j) + AV_RB16(dst + j - soff)); AV_WB16(dst + j, AV_RB16(dst + j) + AV_RB16(dst + j - soff));
dst += stride; dst += stride;
} }
} else { } else {
for (i = 0; i < s->height; i++) { for (i = 0; i < decoded_height; i++) {
for (j = soff; j < ssize; j++) for (j = soff; j < ssize; j++)
dst[j] += dst[j - soff]; dst[j] += dst[j - soff];
dst += stride; dst += 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