| Message ID | 20240519024915.1944150-6-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 4a8506c794d92744514aac26ac9a1b898a7401ab |
| Headers | show |
| Series | [FFmpeg-devel,1/9] avcodec/vqcdec: Check init_get_bits8() for failure | 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 |
On Sun, May 19, 2024 at 10:50 AM Michael Niedermayer <michael@niedermayer.cc> wrote: > Fixes: CID1560042 Unchecked return value > > Sponsored-by: Sovereign Tech Fund > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/vvc/dec.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c > index d262d310125..f2ede490c8b 100644 > --- a/libavcodec/vvc/dec.c > +++ b/libavcodec/vvc/dec.c > @@ -514,6 +514,7 @@ static int slice_init_entry_points(SliceContext *sc, > int nb_eps = sh->r->num_entry_points + 1; > int ctu_addr = 0; > GetBitContext gb; > + int ret; > > if (sc->nb_eps != nb_eps) { > eps_free(sc); > @@ -523,7 +524,9 @@ static int slice_init_entry_points(SliceContext *sc, > sc->nb_eps = nb_eps; > } > > - init_get_bits8(&gb, slice->data, slice->data_size); > + ret = init_get_bits8(&gb, slice->data, slice->data_size); > + if (ret < 0) > + return ret; > for (int i = 0; i < sc->nb_eps; i++) > { > EntryPoint *ep = sc->eps + i; > LGTM. Thank you, Michael. > -- > 2.45.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". >
On Sun, May 19, 2024 at 10:31:50PM +0800, Nuo Mi wrote: > On Sun, May 19, 2024 at 10:50 AM Michael Niedermayer <michael@niedermayer.cc> > wrote: > > > Fixes: CID1560042 Unchecked return value > > > > Sponsored-by: Sovereign Tech Fund > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/vvc/dec.c | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c > > index d262d310125..f2ede490c8b 100644 > > --- a/libavcodec/vvc/dec.c > > +++ b/libavcodec/vvc/dec.c > > @@ -514,6 +514,7 @@ static int slice_init_entry_points(SliceContext *sc, > > int nb_eps = sh->r->num_entry_points + 1; > > int ctu_addr = 0; > > GetBitContext gb; > > + int ret; > > > > if (sc->nb_eps != nb_eps) { > > eps_free(sc); > > @@ -523,7 +524,9 @@ static int slice_init_entry_points(SliceContext *sc, > > sc->nb_eps = nb_eps; > > } > > > > - init_get_bits8(&gb, slice->data, slice->data_size); > > + ret = init_get_bits8(&gb, slice->data, slice->data_size); > > + if (ret < 0) > > + return ret; > > for (int i = 0; i < sc->nb_eps; i++) > > { > > EntryPoint *ep = sc->eps + i; > > > LGTM. > Thank you, Michael. will apply thx [...]
diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index d262d310125..f2ede490c8b 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -514,6 +514,7 @@ static int slice_init_entry_points(SliceContext *sc, int nb_eps = sh->r->num_entry_points + 1; int ctu_addr = 0; GetBitContext gb; + int ret; if (sc->nb_eps != nb_eps) { eps_free(sc); @@ -523,7 +524,9 @@ static int slice_init_entry_points(SliceContext *sc, sc->nb_eps = nb_eps; } - init_get_bits8(&gb, slice->data, slice->data_size); + ret = init_get_bits8(&gb, slice->data, slice->data_size); + if (ret < 0) + return ret; for (int i = 0; i < sc->nb_eps; i++) { EntryPoint *ep = sc->eps + i;
Fixes: CID1560042 Unchecked return value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/vvc/dec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)