From 82bf41f3abce4a13e7c6ad1606eb708f371de87f Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 3 Apr 2020 17:03:38 +0200 Subject: avformat: Replace ffurl_close() by ffurl_closep() where appropriate It avoids leaving dangling pointers behind in memory. Also remove redundant checks for whether the URLContext to be closed is already NULL. Reviewed-by: Anton Khirnov Signed-off-by: Andreas Rheinhardt --- libavformat/rtpproto.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'libavformat/rtpproto.c') diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index 1f0a82ac7e..ca63c165e4 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -363,10 +363,8 @@ static int rtp_open(URLContext *h, const char *uri, int flags) return 0; fail: - if (s->rtp_hd) - ffurl_close(s->rtp_hd); - if (s->rtcp_hd) - ffurl_close(s->rtcp_hd); + ffurl_closep(&s->rtp_hd); + ffurl_closep(&s->rtcp_hd); ffurl_closep(&s->fec_hd); av_free(fec_protocol); av_dict_free(&fec_opts); @@ -506,8 +504,8 @@ static int rtp_close(URLContext *h) ff_ip_reset_filters(&s->filters); - ffurl_close(s->rtp_hd); - ffurl_close(s->rtcp_hd); + ffurl_closep(&s->rtp_hd); + ffurl_closep(&s->rtcp_hd); ffurl_closep(&s->fec_hd); return 0; } -- cgit v1.2.3