From: Nuo Mi <nuomi2021@gmail.com> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: Re: [FFmpeg-devel] [PATCH 2/2] avcodec/vvc/refs: Check content_ref in set_pict_type() Date: Sat, 8 Feb 2025 20:29:55 +0800 Message-ID: <CAFXK13efxsqdLMfRVd=R85iKyjC4Vg4+A3P+TZHRdU=F2zbpyw@mail.gmail.com> (raw) In-Reply-To: <29d07dbe-375d-4540-9204-e5984474ff26@frankplowman.com> On Fri, Feb 7, 2025 at 4:25 AM Frank Plowman <post@frankplowman.com> wrote: > On 02/02/2025 21:17, Michael Niedermayer wrote: > > Fixes: > 390565846/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-4990028521996288 > > Fixes: Null pointer dereference > > > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/vvc/refs.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavcodec/vvc/refs.c b/libavcodec/vvc/refs.c > > index 486515d06db..1cfca482047 100644 > > --- a/libavcodec/vvc/refs.c > > +++ b/libavcodec/vvc/refs.c > > @@ -186,7 +186,7 @@ static void set_pict_type(AVFrame *frame, const > VVCContext *s, const VVCFrameCon > > const CodedBitstreamFragment *current = &s->current_frame; > > for (int i = 0; i < current->nb_units && !has_b; i++) { > > const CodedBitstreamUnit *unit = current->units + i; > > - if (unit->type <= VVC_RSV_IRAP_11) { > > + if (unit->content_ref && unit->type <= VVC_RSV_IRAP_11) { > > const H266RawSliceHeader *rsh = unit->content_ref; > > has_inter |= !IS_I(rsh); > > has_b |= IS_B(rsh); > > I did a little more sniffing around this. unit->content and > unit->content_ref are NULL for NAL units with a type code corresponding > with a reserved or unspecified NAL unit type. Due to the existing > condition on the NAL unit type being a VCL NAL unit type, this means > that unit->type will be in [4..6], which are all reserved. > > Perhaps we might want to add a warning message or something similar > letting the user know some data is being skipped, particularly seeing as > we are talking about video data here? On the other hand, if the > loglevel is set to verbose or above, cbs_read_fragment_content will > produce some log output which eludes to this, although it is a bit > obtuse as codec-specific information is not available there. We can do this with other patch. > In any > case, I agree that adding the extra check on unit->content_ref is correct. > Thank you, Frank and Micheal. Will apply. > > Thank you, > Frank > > _______________________________________________ > 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". > _______________________________________________ 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".
next prev parent reply other threads:[~2025-02-08 12:30 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2025-02-02 21:17 [FFmpeg-devel] [PATCH 1/2] avcodec/vvc/refs: fix negative pps_scaling_win offsets Michael Niedermayer 2025-02-02 21:17 ` [FFmpeg-devel] [PATCH 2/2] avcodec/vvc/refs: Check content_ref in set_pict_type() Michael Niedermayer 2025-02-06 20:25 ` Frank Plowman 2025-02-08 12:29 ` Nuo Mi [this message] 2025-02-03 8:05 ` [FFmpeg-devel] [PATCH 1/2] avcodec/vvc/refs: fix negative pps_scaling_win offsets Frank Plowman 2025-02-03 23:24 ` Michael Niedermayer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAFXK13efxsqdLMfRVd=R85iKyjC4Vg4+A3P+TZHRdU=F2zbpyw@mail.gmail.com' \ --to=nuomi2021@gmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git