[FFmpeg-devel] [PATCH] avformat/utils: Fix NPD when allocating AVStreamInternal fails

Marton Balint cus at passwd.hu
Thu May 13 23:43:08 EEST 2021



On Thu, 13 May 2021, Andreas Rheinhardt wrote:

> Regression since b9c5fdf6027010d15ee90a43aa023e45a5189097;
> fixes Coverity ID #1484786.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
> Checking for st->internal->parser is btw unnecessary as
> av_parser_close(NULL) is safe.

I think it is fine if you also remove the if() in this patch then.

Thanks,
Marton

>
> libavformat/utils.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/libavformat/utils.c b/libavformat/utils.c
> index 492e08562e..85546267f5 100644
> --- a/libavformat/utils.c
> +++ b/libavformat/utils.c
> @@ -4262,13 +4262,12 @@ static void free_stream(AVStream **pst)
>         av_freep(&st->side_data[i].data);
>     av_freep(&st->side_data);
>
> -    if (st->internal->parser)
> -        av_parser_close(st->internal->parser);
> -
>     if (st->attached_pic.data)
>         av_packet_unref(&st->attached_pic);
>
>     if (st->internal) {
> +        if (st->internal->parser)
> +            av_parser_close(st->internal->parser);
>         avcodec_free_context(&st->internal->avctx);
>         av_bsf_free(&st->internal->bsfc);
>         av_freep(&st->internal->priv_pts);
> -- 
> 2.27.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>


More information about the ffmpeg-devel mailing list