[FFmpeg-devel] [PATCH 05/25] avcodec/magicyuv: Check early for invalid slices

Paul B Mahol onemda at gmail.com
Sat Sep 26 13:40:40 EEST 2020


On Sat, Sep 26, 2020 at 12:27:44PM +0200, Andreas Rheinhardt wrote:
> Every plane of each slice has to contain at least two bytes for flags
> and the type of prediction used.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> ---
>  libavcodec/magicyuv.c | 2 ++
>  1 file changed, 2 insertions(+)

lgtm

> 
> diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c
> index d2f6a9b01e..6c29efc9f4 100644
> --- a/libavcodec/magicyuv.c
> +++ b/libavcodec/magicyuv.c
> @@ -614,6 +614,8 @@ static int magy_decode_frame(AVCodecContext *avctx, void *data,
>                  return AVERROR_INVALIDDATA;
>  
>              s->slices[i][j].size = next_offset - offset;
> +            if (s->slices[i][j].size < 2)
> +                return AVERROR_INVALIDDATA;
>              offset = next_offset;
>          }
>  
> -- 
> 2.25.1
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".


More information about the ffmpeg-devel mailing list