[FFmpeg-devel] [PATCH] avcodec/tiff: Check stride for dng

[Michael Niedermayer]

On Mon, Jun 15, 2020 at 09:08:21AM +0800, lance.lmwang at gmail.com wrote:
> On Mon, Jun 15, 2020 at 12:10:14AM +0200, Michael Niedermayer wrote:
> > Fixes: assertion failure
> > Fixes: 23422/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5746026064642048
> > 
> > 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 | 4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
> > index 010943c38c..26a936074f 100644
> > --- a/libavcodec/tiff.c
> > +++ b/libavcodec/tiff.c
> > @@ -679,6 +679,10 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid
> >          return 0;
> >      }
> >  
> > +    if (is_dng && stride == 0)
> > +        return AVERROR_INVALIDDATA;
> > +
> > +
> 
> why add two blank line here?

that was unintended
will apply without the extra blank line,

thx

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

You can kill me, but you cannot change the truth.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20200615/47229fc8/attachment.sig>