[FFmpeg-devel] [PATCH V2] lavc/midivid: FIX CID 1456088

[Andreas Rheinhardt]

On Mon, Dec 23, 2019 at 6:03 AM Limin Wang <lance.lmwang at gmail.com> wrote:

> On Mon, Dec 23, 2019 at 02:00:10AM +0100, Andreas Rheinhardt wrote:
> > On Mon, Dec 23, 2019 at 1:53 AM Limin Wang <lance.lmwang at gmail.com>
> wrote:
> >
> > > On Sun, Dec 22, 2019 at 03:26:58PM +0000, Zhong Li wrote:
> > > > Signed-off-by: Zhong Li <zhongli_dev at 126.com>
> > > > ---
> > > >  libavcodec/midivid.c | 9 ++++++---
> > > >  1 file changed, 6 insertions(+), 3 deletions(-)
> > > >
> > > > diff --git a/libavcodec/midivid.c b/libavcodec/midivid.c
> > > > index 38465c5..3dac3f1 100644
> > > > --- a/libavcodec/midivid.c
> > > > +++ b/libavcodec/midivid.c
> > > > @@ -63,17 +63,20 @@ static int decode_mvdv(MidiVidContext *s,
> > > AVCodecContext *avctx, AVFrame *frame)
> > > >      if (intra_flag) {
> > > >          nb_blocks = (avctx->width / 2) * (avctx->height / 2);
> > > >      } else {
> > > > -        int skip_linesize;
> > > > +        int ret, skip_linesize;
> > > >
> > > >          nb_blocks = bytestream2_get_le32(gb);
> > > >          skip_linesize = avctx->width >> 1;
> > > >          mask_start = gb->buffer_start + bytestream2_tell(gb);
> > > >          mask_size = (avctx->width >> 5) * (avctx->height >> 2);
> > > >
> > > > -        if (bytestream2_get_bytes_left(gb) < mask_size)
> > > > +        ret = bytestream2_get_bytes_left(gb);
> > > > +        if (ret < mask_size)
> > > >              return AVERROR_INVALIDDATA;
> > >
> > > don't need change it I think.
> > >
> > > >
> > > > -        init_get_bits8(&mask, mask_start, mask_size);
> > > > +        ret = init_get_bits8(&mask, mask_start, mask_size);
> > > > +        if (ret < 0)
> > > > +            return AVERROR_INVALIDDATA;
> > >
> > > return ret. That's why use ret.
> > >
> > >
> > But you are not returning ret.
>
> But It's not my code, I'm a code reviewer.
>
>
You are right. Forget my previous mail, it's just nonsense then.

- Andreas