Re: [FFmpeg-devel] [PATCH 4/7] avcodec/avs2_parser: Assert init_get_bits8() success with const size 15

From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 4/7] avcodec/avs2_parser: Assert init_get_bits8() success with const size 15
Date: Thu, 2 May 2024 23:32:21 +0200
Message-ID: <20240502213221.GF6420@pb2> (raw)
In-Reply-To: <AS8P250MB0744F5AF79EE35AC1DE428A08F182@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>

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

On Thu, May 02, 2024 at 10:25:24AM +0200, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > Fixes: CID1506708 Unchecked return value
> > 
> > Sponsored-by: Sovereign Tech Fund
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/avs2_parser.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c
> > index 200134f91db..8d4bc3cee0d 100644
> > --- a/libavcodec/avs2_parser.c
> > +++ b/libavcodec/avs2_parser.c
> > @@ -72,13 +72,15 @@ static void parse_avs2_seq_header(AVCodecParserContext *s, const uint8_t *buf,
> >      unsigned aspect_ratio;
> >      unsigned frame_rate_code;
> >      int low_delay;
> > +    int ret;
> >      // update buf_size_min if parse more deeper
> >      const int buf_size_min = 15;
> >  
> >      if (buf_size < buf_size_min)
> >          return;
> >  
> > -    init_get_bits8(&gb, buf, buf_size_min);
> > +    ret = init_get_bits8(&gb, buf, buf_size_min);
> > +    av_assert2(ret >= 0);
> >  
> >      s->key_frame = 1;
> >      s->pict_type = AV_PICTURE_TYPE_I;
> 
> Code like this may trigger set-but-unused variable warnings when
> ASSERT_LEVEL is <= 1. Add av_unused to ret to fix this.
> Apart from that, it should be av_assert1 (this is not hot).

will apply with these changes

thx

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

Observe your enemies, for they first find out your faults. -- Antisthenes

[-- 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".