[FFmpeg-cvslog] avformat/utils: Add av_assert1 to preclude NULL + len, len != 0

Andreas Rheinhardt git at videolan.org
Mon Feb 15 17:53:25 EET 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Feb 14 23:55:39 2021 +0100| [da857099e92fb7fede6d7b9e6b26879ce9c5a483] | committer: Andreas Rheinhardt

avformat/utils: Add av_assert1 to preclude NULL + len, len != 0

Such a scenario is undefined behaviour and would also indicate a bug
in our code.

Suggested-by: James Almer <jamrial at gmail.com>
Reviewed-by: James Almer <jamrial at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

 libavformat/utils.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index cea6d4ca92..652758e98e 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1426,6 +1426,7 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt,
         pkt->pts = pkt->dts = AV_NOPTS_VALUE;
         pkt->pos = -1;
         /* increment read pointer */
+        av_assert1(data || !len);
         data  = len ? data + len : data;
         size -= len;
 



More information about the ffmpeg-cvslog mailing list