From 122fcf1f407b60baf7a0322b73798958ca6108eb Mon Sep 17 00:00:00 2001 From: Andriy Gelman Date: Mon, 12 Oct 2020 16:36:06 -0400 Subject: [PATCH] avformat/rtspdec: fix mem leaks in connect mode if init fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #6334 Reviewed-by: Martin Storsjö Signed-off-by: Andriy Gelman --- libavformat/rtspdec.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index dfc84e71ba..8a2abc8ee9 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -735,22 +735,26 @@ static int rtsp_read_header(AVFormatContext *s) rt->real_setup_cache = !s->nb_streams ? NULL : av_mallocz_array(s->nb_streams, 2 * sizeof(*rt->real_setup_cache)); - if (!rt->real_setup_cache && s->nb_streams) - return AVERROR(ENOMEM); + if (!rt->real_setup_cache && s->nb_streams) { + ret = AVERROR(ENOMEM); + goto fail; + } rt->real_setup = rt->real_setup_cache + s->nb_streams; if (rt->initial_pause) { /* do not start immediately */ } else { if ((ret = rtsp_read_play(s)) < 0) { - ff_rtsp_close_streams(s); - ff_rtsp_close_connections(s); - return ret; + goto fail; } } } return 0; + +fail: + rtsp_read_close(s); + return ret; } int ff_rtsp_tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,