[FFmpeg-devel] [PATCH 1/2] avcodec/utils: use 32pixel alignment for bink

[Peter Ross]

On Sun, Jan 22, 2023 at 01:02:21AM +0100, Michael Niedermayer wrote:
> bink supports 16x16 blocks in chroma planes thus we need to allocate enough.
> Fixes: out of array access
> Fixes: 55026/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-6013915371012096
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavcodec/utils.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> index 2b63a498b9..87634e3711 100644
> --- a/libavcodec/utils.c
> +++ b/libavcodec/utils.c
> @@ -243,6 +243,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
>      case AV_PIX_FMT_GBRAP16BE:
>          w_align = 16; //FIXME assume 16 pixel per macroblock
>          h_align = 16 * 2; // interlaced needs 2 macroblocks height
> +        if (s->codec_id == AV_CODEC_ID_BINKVIDEO)
> +            w_align = 16*2;
>          break;
>      case AV_PIX_FMT_YUV411P:
>      case AV_PIX_FMT_YUVJ411P:

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/20230127/563579da/attachment.sig>