[FFmpeg-devel] [PATCH 1/2] avcodec/tiff: Limit filtering to decoded data

[Michael Niedermayer]

On Sat, Nov 24, 2018 at 11:44:42AM +0100, Tomas Härdin wrote:
> fre 2018-11-23 klockan 02:33 +0100 skrev Michael Niedermayer:
> > 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/ffmpeg
> > > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavcodec/tiff.c | 9 ++++++---
> >  1 file changed, 6 insertions(+), 3 deletions(-)
> > 
> > diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
> > index 74b76c9fdf..6271c937c3 100644
> > --- a/libavcodec/tiff.c
> > +++ b/libavcodec/tiff.c
> > @@ -1421,6 +1421,7 @@ again:
> >      planes = s->planar ? s->bppcount : 1;
> >      for (plane = 0; plane < planes; plane++) {
> >          int remaining = avpkt->size;
> > +        int decoded_height;
> >          stride = p->linesize[plane];
> >          dst = p->data[plane];
> >          for (i = 0; i < s->height; i += s->rps) {
> > @@ -1448,6 +1449,8 @@ again:
> >                  break;
> >              }
> >          }
> > +        decoded_height = FFMIN(i, s->height);
> > +
> >          if (s->predictor == 2) {
> >              if (s->photometric == TIFF_PHOTOMETRIC_YCBCR) {
> >                  av_log(s->avctx, AV_LOG_ERROR, "predictor == 2 with YUV is unsupported");
> > @@ -1464,7 +1467,7 @@ again:
> >                  s->avctx->pix_fmt == AV_PIX_FMT_YA16LE ||
> >                  s->avctx->pix_fmt == AV_PIX_FMT_GBRP16LE ||
> >                  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)
> >                          AV_WL16(dst + j, AV_RL16(dst + j) + AV_RL16(dst + j - soff));
> >                      dst += stride;
> > @@ -1475,13 +1478,13 @@ again:
> >                         s->avctx->pix_fmt == AV_PIX_FMT_YA16BE ||
> >                         s->avctx->pix_fmt == AV_PIX_FMT_GBRP16BE ||
> >                         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)
> >                          AV_WB16(dst + j, AV_RB16(dst + j) + AV_RB16(dst + j - soff));
> >                      dst += stride;
> >                  }
> >              } else {
> > -                for (i = 0; i < s->height; i++) {
> > +                for (i = 0; i < decoded_height; i++) {
> >                      for (j = soff; j < ssize; j++)
> >                          dst[j] += dst[j - soff];
> >                      dst += stride;
> 
> Looks OK

will apply

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

There will always be a question for which you do not know the correct answer.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20181125/c275e7e0/attachment.sig>