| Message ID | 20240630231306.3779027-2-michael@niedermayer.cc |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,01/11] MAINTAINERS: Add Timo Rothenpieler to server admins | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | fail | Make fate failed |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Mon, Jul 1, 2024 at 7:13 AM Michael Niedermayer <michael@niedermayer.cc> wrote: > Fixes: signed integer overflow: 1107820800 + 1107820800 cannot be > represented in type 'int' > Fixes: left shift of 1091059712 by 6 places cannot be represented in type > 'int' > Fixes: > 69910/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-5162839971528704 > LGTM > > 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/dec.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c > index a6b601b778c..563f6fcf082 100644 > --- a/libavcodec/vvc/dec.c > +++ b/libavcodec/vvc/dec.c > @@ -476,13 +476,14 @@ static int slices_realloc(VVCFrameContext *fc) > return 0; > } > > -static void ep_init_cabac_decoder(SliceContext *sc, const int index, > +static int ep_init_cabac_decoder(SliceContext *sc, const int index, > const H2645NAL *nal, GetBitContext *gb, const CodedBitstreamUnit > *unit) > { > const H266RawSlice *slice = unit->content_ref; > const H266RawSliceHeader *rsh = sc->sh.r; > EntryPoint *ep = sc->eps + index; > int size; > + int ret; > > if (index < rsh->num_entry_points) { > int skipped = 0; > @@ -501,8 +502,11 @@ static void ep_init_cabac_decoder(SliceContext *sc, > const int index, > size = get_bits_left(gb) / 8; > } > av_assert0(gb->buffer + get_bits_count(gb) / 8 + size <= > gb->buffer_end); > - ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, > size); > + ret = ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) > / 8, size); > + if (ret < 0) > + return ret; > skip_bits(gb, size * 8); > + return 0; > } > > static int slice_init_entry_points(SliceContext *sc, > @@ -538,7 +542,9 @@ static int slice_init_entry_points(SliceContext *sc, > fc->tab.slice_idx[rs] = sc->slice_idx; > } > > - ep_init_cabac_decoder(sc, i, nal, &gb, unit); > + ret = ep_init_cabac_decoder(sc, i, nal, &gb, unit); > + if (ret < 0) > + return ret; > > if (i + 1 < sc->nb_eps) > ctu_addr = sh->entry_point_start_ctu[i]; > -- > 2.45.2 > > _______________________________________________ > 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". >
On Mon, Jul 01, 2024 at 08:54:33PM +0800, Nuo Mi wrote: > On Mon, Jul 1, 2024 at 7:13 AM Michael Niedermayer <michael@niedermayer.cc> > wrote: > > > Fixes: signed integer overflow: 1107820800 + 1107820800 cannot be > > represented in type 'int' > > Fixes: left shift of 1091059712 by 6 places cannot be represented in type > > 'int' > > Fixes: > > 69910/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-5162839971528704 > > > LGTM will apply thx [...]
diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index a6b601b778c..563f6fcf082 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -476,13 +476,14 @@ static int slices_realloc(VVCFrameContext *fc) return 0; } -static void ep_init_cabac_decoder(SliceContext *sc, const int index, +static int ep_init_cabac_decoder(SliceContext *sc, const int index, const H2645NAL *nal, GetBitContext *gb, const CodedBitstreamUnit *unit) { const H266RawSlice *slice = unit->content_ref; const H266RawSliceHeader *rsh = sc->sh.r; EntryPoint *ep = sc->eps + index; int size; + int ret; if (index < rsh->num_entry_points) { int skipped = 0; @@ -501,8 +502,11 @@ static void ep_init_cabac_decoder(SliceContext *sc, const int index, size = get_bits_left(gb) / 8; } av_assert0(gb->buffer + get_bits_count(gb) / 8 + size <= gb->buffer_end); - ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, size); + ret = ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, size); + if (ret < 0) + return ret; skip_bits(gb, size * 8); + return 0; } static int slice_init_entry_points(SliceContext *sc, @@ -538,7 +542,9 @@ static int slice_init_entry_points(SliceContext *sc, fc->tab.slice_idx[rs] = sc->slice_idx; } - ep_init_cabac_decoder(sc, i, nal, &gb, unit); + ret = ep_init_cabac_decoder(sc, i, nal, &gb, unit); + if (ret < 0) + return ret; if (i + 1 < sc->nb_eps) ctu_addr = sh->entry_point_start_ctu[i];
Fixes: signed integer overflow: 1107820800 + 1107820800 cannot be represented in type 'int' Fixes: left shift of 1091059712 by 6 places cannot be represented in type 'int' Fixes: 69910/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-5162839971528704 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/dec.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)