From 6ff2aba08811876bfdc3c7df6f73f47f27b93803 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 13 May 2021 22:06:02 +0200 Subject: avformat/utils: Fix NPD when allocating AVStreamInternal fails Regression since b9c5fdf6027010d15ee90a43aa023e45a5189097; fixes Coverity ID #1484786. Also remove the check for st->internal->parser as av_parser_close(NULL) is a no-op. Reviewed-by: James Almer Reviewed-by: Marton Balint Signed-off-by: Andreas Rheinhardt --- libavformat/utils.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libavformat/utils.c') diff --git a/libavformat/utils.c b/libavformat/utils.c index 492e08562e..fe8eaa6cb3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4262,13 +4262,11 @@ 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) { + av_parser_close(st->internal->parser); avcodec_free_context(&st->internal->avctx); av_bsf_free(&st->internal->bsfc); av_freep(&st->internal->priv_pts); -- cgit v1.2.3