[FFmpeg-devel] [PATCH 2/4] avformat/wtvdec: Check dir_length

[Peter Ross]

On Mon, Oct 19, 2020 at 05:59:53PM +0200, Michael Niedermayer wrote:
> Fixes: Infinite loop
> Fixes: 26445/clusterfuzz-testcase-minimized-ffmpeg_dem_WTV_fuzzer-5125558331244544
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavformat/wtvdec.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
> index 83f510b92f..77908e6392 100644
> --- a/libavformat/wtvdec.c
> +++ b/libavformat/wtvdec.c
> @@ -273,6 +273,11 @@ static AVIOContext * wtvfile_open2(AVFormatContext *s, const uint8_t *buf, int b
>                     "bad filename length, remaining directory entries ignored\n");
>              break;
>          }
> +        if (dir_length == 0) {
> +            av_log(s, AV_LOG_ERROR,
> +                   "bad dir length, remaining directory entries ignored\n");
> +            break;
> +        }
>          if (48 + (int64_t)name_size > buf_end - buf) {
>              av_log(s, AV_LOG_ERROR, "filename exceeds buffer size; remaining directory entries ignored\n");
>              break;
> -- 

looks good

-- 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/20201020/fa825d71/attachment.sig>