Re: [FFmpeg-devel] [PATCH 8/9] avformat/icodec: Check nb_pal

From: Peter Ross <pross@xvid.org>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 8/9] avformat/icodec: Check nb_pal
Date: Sun, 18 Sep 2022 09:11:47 +1000
Message-ID: <YyZUM1ElpnJ2JUIP@15fc8db07f19f8c510f57cfd648a18df> (raw)
In-Reply-To: <20220917211557.11547-8-michael@niedermayer.cc>

[-- Attachment #1.1: Type: text/plain, Size: 1131 bytes --]

On Sat, Sep 17, 2022 at 11:15:56PM +0200, Michael Niedermayer wrote:
> Fixes: signed integer overflow: 538976288 * 4 cannot be represented in type 'int'
> Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_ICO_fuzzer-6690068904935424
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/icodec.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/libavformat/icodec.c b/libavformat/icodec.c
> index 290f658d0c0..85dab3bca0a 100644
> --- a/libavformat/icodec.c
> +++ b/libavformat/icodec.c
> @@ -196,6 +196,9 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
>              AV_WL32(buf + 32, image->nb_pal);
>          }
>  
> +        if (image->nb_pal > INT_MAX / 4 - 14 - 40)
> +            return AVERROR_INVALIDDATA;
> +
>          AV_WL32(buf - 4, 14 + 40 + image->nb_pal * 4);
>          AV_WL32(buf + 8, AV_RL32(buf + 8) / 2);
>      }
> -- 
> 2.17.1

lgtm, please apply

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".