[FFmpeg-devel] [PATCH v3 1/1] avcodec/vp6: return value check for init_get_bits

[Peter Ross]

On Mon, Aug 23, 2021 at 02:35:01PM -0400, maryam ebrahimzadeh wrote:
> avcodec/vp6: Return value check for init_get_bits
> 
> As the second argument for init_get_bits(buf) can be crafted,
> a return value check for this function call is necessary.
> Also replace init_get_bits with init_get_bits8.
> ---
>  libavcodec/vp6.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
> index 73822a00f9..d024370793 100644
> --- a/libavcodec/vp6.c
> +++ b/libavcodec/vp6.c
> @@ -167,7 +167,9 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size)
>          }
>          if (s->use_huffman) {
>              s->parse_coeff = vp6_parse_coeff_huffman;
> -            init_get_bits(&s->gb, buf, buf_size<<3);
> +            ret = init_get_bits8(&s->gb, buf, buf_size);
> +            if (ret < 0)
> +                return ret;
>          } else {
>              ret = ff_vp56_init_range_decoder(&s->cc, buf, buf_size);
>              if (ret < 0)
> -- 
> 2.17.1

looks good, please apply.

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20210825/f101fde5/attachment.sig>