Message ID | 20240227224708.6883-1-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | b95c0d93fff06c695c074e512c4bce8788f9ff56 |
Headers | show |
Series | [FFmpeg-devel,1/2] avcodec/vvc/vvcdec: allow vvc_decode_close() on failed open | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Pushed the VVC patch. Thank you, Michael. On Wed, Feb 28, 2024 at 6:47 AM Michael Niedermayer <michael@niedermayer.cc> wrote: > Fixes: division by 0 > Fixes: > 67008/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-5873503163187200 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by > <https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by>: > Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/vvc/vvcdec.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/vvc/vvcdec.c b/libavcodec/vvc/vvcdec.c > index f024cbd067..570e2aa513 100644 > --- a/libavcodec/vvc/vvcdec.c > +++ b/libavcodec/vvc/vvcdec.c > @@ -950,13 +950,14 @@ static av_cold void vvc_decode_flush(AVCodecContext > *avctx) > { > VVCContext *s = avctx->priv_data; > int got_output = 0; > - VVCFrameContext *last; > > while (s->nb_delayed) > wait_delayed_frame(s, NULL, &got_output); > > - last = get_frame_context(s, s->fcs, s->nb_frames - 1); > - ff_vvc_flush_dpb(last); > + if (s->fcs) { > + VVCFrameContext *last = get_frame_context(s, s->fcs, s->nb_frames > - 1); > + ff_vvc_flush_dpb(last); > + } > > s->eos = 1; > } > -- > 2.17.1 > > _______________________________________________ > 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". >
diff --git a/libavcodec/vvc/vvcdec.c b/libavcodec/vvc/vvcdec.c index f024cbd067..570e2aa513 100644 --- a/libavcodec/vvc/vvcdec.c +++ b/libavcodec/vvc/vvcdec.c @@ -950,13 +950,14 @@ static av_cold void vvc_decode_flush(AVCodecContext *avctx) { VVCContext *s = avctx->priv_data; int got_output = 0; - VVCFrameContext *last; while (s->nb_delayed) wait_delayed_frame(s, NULL, &got_output); - last = get_frame_context(s, s->fcs, s->nb_frames - 1); - ff_vvc_flush_dpb(last); + if (s->fcs) { + VVCFrameContext *last = get_frame_context(s, s->fcs, s->nb_frames - 1); + ff_vvc_flush_dpb(last); + } s->eos = 1; }
Fixes: division by 0 Fixes: 67008/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-5873503163187200 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/vvcdec.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)