[FFmpeg-cvslog] avfilter/avfiltergraph: Remove NULL checks after dereferences

Michael Niedermayer git at videolan.org
Wed May 19 21:26:26 EEST 2021


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue May 18 22:03:11 2021 +0200| [1642d8188d6e475b12ef41ec9b5775e5abadeb0d] | committer: Michael Niedermayer

avfilter/avfiltergraph: Remove NULL checks after dereferences

Fixes: CID1398579 Dereference before null check
Reviewed-by: Nicolas George <george at nsup.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavfilter/avfiltergraph.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index ed54d3dc11..5389d82d9f 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -1360,8 +1360,8 @@ int avfilter_graph_request_oldest(AVFilterGraph *graph)
         if (r != AVERROR_EOF)
             break;
         av_log(oldest->dst, AV_LOG_DEBUG, "EOF on sink link %s:%s.\n",
-               oldest->dst ? oldest->dst->name : "unknown",
-               oldest->dstpad ? oldest->dstpad->name : "unknown");
+               oldest->dst->name,
+               oldest->dstpad->name);
         /* EOF: remove the link from the heap */
         if (oldest->age_index < --graph->sink_links_count)
             heap_bubble_down(graph, graph->sink_links[graph->sink_links_count],



More information about the ffmpeg-cvslog mailing list