Re: [FFmpeg-devel] [PATCH 1/2] avformat/matroskadec: assert non NULL buf

From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 1/2] avformat/matroskadec: assert non NULL buf
Date: Fri, 20 May 2022 09:17:50 +0200
Message-ID: <DB6PR0101MB2214F438F381768D0C656F0B8FD39@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com> (raw)
In-Reply-To: <20220519234312.11733-1-michael@niedermayer.cc>

Michael Niedermayer:
> The code is only called if size is > 0 so buf should not be NULL
> 
> Helps: CID610554
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/matroskadec.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
> index 4715f1b7d4..de73f97aca 100644
> --- a/libavformat/matroskadec.c
> +++ b/libavformat/matroskadec.c
> @@ -3701,6 +3701,8 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf
>      uint64_t num;
>      int trust_default_duration;
>  
> +    av_assert1(buf);
> +
>      ffio_init_context(&pb, data, size, 0, NULL, NULL, NULL, NULL);
>  
>      if ((n = ebml_read_num(matroska, &pb.pub, 8, &num, 1)) < 0)

Ok.

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