Re: [FFmpeg-devel] [PATCH 5/5] avcodec/h266_metadata_bsf: Check if there are CodedBitstreamFragment units

From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 5/5] avcodec/h266_metadata_bsf: Check if there are CodedBitstreamFragment units
Date: Sun, 23 Jul 2023 20:08:56 +0200
Message-ID: <20230723180856.GL7802@pb2> (raw)
In-Reply-To: <c9f85ed0-b6b8-b74e-c221-d516a572b0a5@gmail.com>

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

On Sun, Jul 23, 2023 at 03:07:32PM -0300, James Almer wrote:
> On 7/23/2023 3:03 PM, Michael Niedermayer wrote:
> > Fixes: NULL pointer dereference
> > Fixes: 60269/clusterfuzz-testcase-minimized-ffmpeg_BSF_VVC_METADATA_fuzzer-5215449416335360
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >   libavcodec/h266_metadata_bsf.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/libavcodec/h266_metadata_bsf.c b/libavcodec/h266_metadata_bsf.c
> > index c0dbf8ef96..1f0f875cfe 100644
> > --- a/libavcodec/h266_metadata_bsf.c
> > +++ b/libavcodec/h266_metadata_bsf.c
> > @@ -43,7 +43,7 @@ static int h266_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt,
> >       int err, i;
> >       // If an AUD is present, it must be the first NAL unit.
> > -    if (pu->units[0].type == VVC_AUD_NUT) {
> > +    if (pu->nb_units && pu->units[0].type == VVC_AUD_NUT) {
> >           if (ctx->aud == BSF_ELEMENT_REMOVE)
> >               ff_cbs_delete_unit(pu, 0);
> >       } else if ( pkt && ctx->aud == BSF_ELEMENT_INSERT) {
> 
> Should be ok.

will apply

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The worst form of inequality is to try to make unequal things equal.
-- 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".