[FFmpeg-cvslog] avformat/rtspdec: fix mem leaks in listen mode if init fails

Andriy Gelman git at videolan.org
Sat Nov 21 18:23:01 EET 2020


ffmpeg | branch: master | Andriy Gelman <andriy.gelman at gmail.com> | Mon Oct 12 16:36:05 2020 -0400| [38bc4ba142b2304b2a0e2d86f271a28d51250fb9] | committer: Andriy Gelman

avformat/rtspdec: fix mem leaks in listen mode if init fails

Reviewed-by: Martin Storsjö <martin at martin.st>
Signed-off-by: Andriy Gelman <andriy.gelman at gmail.com>

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

 libavformat/rtspdec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index e0e8fc2e49..dfc84e71ba 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -694,12 +694,13 @@ static int rtsp_listen(AVFormatContext *s)
         } else if (methodcode == SETUP)
             ret = rtsp_read_setup(s, host, uri);
         if (ret) {
-            ffurl_close(rt->rtsp_hd);
             ret = AVERROR_INVALIDDATA;
             goto fail;
         }
     }
 fail:
+    ff_rtsp_close_streams(s);
+    ff_rtsp_close_connections(s);
     ff_network_close();
     return ret;
 }



More information about the ffmpeg-cvslog mailing list