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

James Almer jamrial at gmail.com
Mon Feb 15 17:13:17 EET 2021


On 2/14/2021 8:20 PM, Andreas Rheinhardt wrote:
> Such a scenario is undefined behaviour and would also indicate a bug
> in our code.
> 
> Suggested-by: James Almer <jamrial at gmail.com>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> ---
>   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;

LGTM.


More information about the ffmpeg-devel mailing list