From ad06929d8d95542e661a337423f457f5692e6b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Bengtsson-=C3=96lund?= Date: Tue, 1 Jun 2021 18:50:51 +0200 Subject: [PATCH] avformat/http: Stop cookie_dict leaking on errors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This solves the memory leak reported in https://trac.ffmpeg.org/ticket/9273 Signed-off-by: Robert Bengtsson-Ölund --- libavformat/http.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/http.c b/libavformat/http.c index 1fc95c768c..476b9a8456 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -605,6 +605,7 @@ static int http_listen(URLContext *h, const char *uri, int flags, } fail: av_dict_free(&s->chained_options); + av_dict_free(&s->cookie_dict); return ret; } @@ -645,8 +646,10 @@ static int http_open(URLContext *h, const char *uri, int flags, } ret = http_open_cnx(h, options); bail_out: - if (ret < 0) + if (ret < 0) { av_dict_free(&s->chained_options); + av_dict_free(&s->cookie_dict); + } return ret; } @@ -1763,6 +1766,7 @@ static int http_close(URLContext *h) if (s->hd) ffurl_closep(&s->hd); av_dict_free(&s->chained_options); + av_dict_free(&s->cookie_dict); return ret; }