Re: [FFmpeg-devel] [PATCH 6/6] avformat/wtvdec: Check length of read mpeg2_descriptor

From: Peter Ross <pross@xvid.org>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 6/6] avformat/wtvdec: Check length of read mpeg2_descriptor
Date: Wed, 7 Aug 2024 10:02:09 +1000
Message-ID: <ZrK5gTpjL-VzICst@7ba90722f570c2b0104f5b8afe4fa274> (raw)
In-Reply-To: <20240806221853.959177-6-michael@niedermayer.cc>

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

On Wed, Aug 07, 2024 at 12:18:53AM +0200, Michael Niedermayer wrote:
> Fixes: Use of uninitialized value
> Fixes: 70900/clusterfuzz-testcase-minimized-ffmpeg_dem_WTV_fuzzer-6286909377150976
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/wtvdec.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
> index 1a6c4c33481..730c7fca783 100644
> --- a/libavformat/wtvdec.c
> +++ b/libavformat/wtvdec.c
> @@ -846,7 +846,8 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p
>                  }
>  
>                  buf_size = FFMIN(len - consumed, sizeof(buf));
> -                avio_read(pb, buf, buf_size);
> +                if (avio_read(pb, buf, buf_size) != buf_size)
> +                    return AVERROR_INVALIDDATA;
>                  consumed += buf_size;
>                  ff_parse_mpeg2_descriptor(s, st, 0, &pbuf, buf + buf_size, NULL, 0, 0, NULL);
>              }

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".