[FFmpeg-devel] [PATCH] libavcodec/jpeg2000dec.c: Fix cblk decode error check

[Carl Eugen Hoyos]

Am Fr., 10. Apr. 2020 um 19:48 Uhr schrieb Gautam Ramakrishnan
<gautamramk at gmail.com>:
>
> On Wed, Apr 1, 2020 at 5:48 PM Paul B Mahol <onemda at gmail.com> wrote:
> >
> > LGTM
> >
> > On 4/1/20, gautamramk at gmail.com <gautamramk at gmail.com> wrote:
> > > From: Gautam Ramakrishnan <gautamramk at gmail.com>
> > >
> > > bpno becoming negative is not an error. This check has
> > > been verified with openjpeg, where the loop ends safely
> > > when bpno becomes negative, instead of returning an error.
> > > This patch must resolve ticket #5630.
> > > ---
> > >  libavcodec/jpeg2000dec.c | 3 +--
> > >  1 file changed, 1 insertion(+), 2 deletions(-)
> > >
> > > diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
> > > index 7103cd6ceb..c5711b60ec 100644
> > > --- a/libavcodec/jpeg2000dec.c
> > > +++ b/libavcodec/jpeg2000dec.c
> > > @@ -1562,8 +1562,7 @@ static int decode_cblk(Jpeg2000DecoderContext *s,
> > > Jpeg2000CodingStyle *codsty,
> > >
> > >      while (passno--) {
> > >          if (bpno < 0) {
> > > -            av_log(s->avctx, AV_LOG_ERROR, "bpno became negative\n");
> > > -            return AVERROR_INVALIDDATA;
> > > +            break;
> > >          }
> > >          switch(pass_t) {
> > >          case 0:
> > > --
> > > 2.17.1

> There were a lot of other changes to jpeg2000dec.c
> after this was sent. Do I resubmit this patch?

Yes, please do.

Carl Eugen