[FFmpeg-devel] [PATCH 1/2] avformat/matroskadec: assert non NULL buf
The code is only called if size is > 0 so buf should not be NULL Helps: CID610554 Signed-off-by: Michael Niedermayer --- 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) -- 2.17.1 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH 1/2] avformat/matroskadec: assert non NULL buf
Michael Niedermayer: > The code is only called if size is > 0 so buf should not be NULL > > Helps: CID610554 > > Signed-off-by: Michael Niedermayer > --- > 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-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH 1/2] avformat/matroskadec: assert non NULL buf
On Fri, May 20, 2022 at 09:17:50AM +0200, Andreas Rheinhardt wrote: > Michael Niedermayer: > > The code is only called if size is > 0 so buf should not be NULL > > > > Helps: CID610554 > > > > Signed-off-by: Michael Niedermayer > > --- > > 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. will apply thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The bravest are surely those who have the clearest vision of what is before them, glory and danger alike, and yet notwithstanding go out to meet it. -- Thucydides signature.asc Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
