Re: [FFmpeg-devel] [PATCH 1/4] avcodec/jpeg2000dec: Check image offset

[Michael Niedermayer <michael@niedermayer.cc>]

[-- Attachment #1.1: Type: text/plain, Size: 1326 bytes --]

On Wed, Oct 25, 2023 at 09:20:09PM +0200, Tomas Härdin wrote:
> On Thu, 2023-10-05 at 00:59 +0200, Michael Niedermayer wrote:
> > Fixes: left shift of negative value -538967841
> > Fixes: 62447/clusterfuzz-testcase-minimized-
> > ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-6427134337613824
> > 
> > Found-by: continuous fuzzing process
> > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/jpeg2000dec.c | 5 +++++
> >  1 file changed, 5 insertions(+)
> > 
> > diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
> > index eda959e558d..691cfbd8915 100644
> > --- a/libavcodec/jpeg2000dec.c
> > +++ b/libavcodec/jpeg2000dec.c
> > @@ -238,6 +238,11 @@ static int get_siz(Jpeg2000DecoderContext *s)
> >          return AVERROR_INVALIDDATA;
> >      }
> >  
> > +    if (s->image_offset_x >= s->width || s->image_offset_y >= s-
> > >height) {
> > +        av_log(s->avctx, AV_LOG_ERROR, "image offsets outside
> > image");
> > +        return AVERROR_INVALIDDATA;
> > +    }
> 
> Probably OK

will apply

thx

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

Republics decline into democracies and democracies degenerate into
despotisms. -- Aristotle

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".