[FFmpeg-devel] [PATCH 4/4] avcodec/photocd: Use ff_set_dimensions()

[Paul B Mahol]

On Sun, Sep 20, 2020 at 10:26:08PM +0200, Michael Niedermayer wrote:
> Fixes: out of memory
> Fixes: 25588/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PHOTOCD_fuzzer-6612945080156160
> 
> 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/photocd.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/photocd.c b/libavcodec/photocd.c
> index 057c9d33d4..07f10e28b7 100644
> --- a/libavcodec/photocd.c
> +++ b/libavcodec/photocd.c
> @@ -324,8 +324,9 @@ static int photocd_decode_frame(AVCodecContext *avctx, void *data,
>      else
>          s->resolution = av_clip(4 - s->lowres, 0, 4);
>  
> -    avctx->width  = img_info[s->resolution].width;
> -    avctx->height = img_info[s->resolution].height;
> +    ret = ff_set_dimensions(avctx, img_info[s->resolution].width, img_info[s->resolution].height);
> +    if (ret < 0)
> +        return ret;
>  
>      if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0)
>          return ret;

Why is this needed at all, dimensions are alway static and completely allocable.