[FFmpeg-cvslog] avformat/matroskadec: assert non NULL buf

Michael Niedermayer git at videolan.org
Thu May 26 12:54:33 EEST 2022


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri May 20 00:36:34 2022 +0200| [d84f03609ef36db0cdc48b3bbce3c5cd04bf18a1] | committer: Michael Niedermayer

avformat/matroskadec: assert non NULL buf

The code is only called if size is > 0 so buf should not be NULL

Helps: CID610554

Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d84f03609ef36db0cdc48b3bbce3c5cd04bf18a1
---

 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)



More information about the ffmpeg-cvslog mailing list