| Message ID | 20210727182504.158364-1-tfoucu@gmail.com |
|---|---|
| State | Accepted |
| Commit | fc300613bec1e55974d45f955265b72cbf9b5683 |
| Headers | show |
| Series | [FFmpeg-devel] libavcodec/mpeg12dec.c: Switch to init_get_bits8 and checks return value | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
On Tue, Jul 27, 2021 at 11:25:04AM -0700, Thierry Foucu wrote: > --- > libavcodec/mpeg12dec.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c > index b27ed5bd6d..858dca660c 100644 > --- a/libavcodec/mpeg12dec.c > +++ b/libavcodec/mpeg12dec.c > @@ -1340,9 +1340,11 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, const uint8_t *buf, > { > Mpeg1Context *s1 = avctx->priv_data; > MpegEncContext *s = &s1->mpeg_enc_ctx; > - int ref, f_code, vbv_delay; > + int ref, f_code, vbv_delay, ret; > > - init_get_bits(&s->gb, buf, buf_size * 8); > + ret = init_get_bits8(&s->gb, buf, buf_size); > + if (ret < 0) > + return ret; > > ref = get_bits(&s->gb, 10); /* temporal ref */ > s->pict_type = get_bits(&s->gb, 3); will apply thx [...]
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index b27ed5bd6d..858dca660c 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1340,9 +1340,11 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, const uint8_t *buf, { Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; - int ref, f_code, vbv_delay; + int ref, f_code, vbv_delay, ret; - init_get_bits(&s->gb, buf, buf_size * 8); + ret = init_get_bits8(&s->gb, buf, buf_size); + if (ret < 0) + return ret; ref = get_bits(&s->gb, 10); /* temporal ref */ s->pict_type = get_bits(&s->gb, 3);