From 1ca87d600bc069fe4cf497c410b4f794e88a122d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 1 Dec 2011 11:07:35 +0200 Subject: [PATCH] applehttpproto: Use the close function if the open function fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should clean up leaked memory. Signed-off-by: Martin Storsjö --- libavformat/applehttpproto.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavformat/applehttpproto.c b/libavformat/applehttpproto.c index 0e64dadb39..8dbcf2d394 100644 --- a/libavformat/applehttpproto.c +++ b/libavformat/applehttpproto.c @@ -174,6 +174,17 @@ fail: return ret; } +static int applehttp_close(URLContext *h) +{ + AppleHTTPContext *s = h->priv_data; + + free_segment_list(s); + free_variant_list(s); + ffurl_close(s->seg_hd); + av_free(s); + return 0; +} + static int applehttp_open(URLContext *h, const char *uri, int flags) { AppleHTTPContext *s; @@ -229,7 +240,7 @@ static int applehttp_open(URLContext *h, const char *uri, int flags) return 0; fail: - av_free(s); + applehttp_close(h); return ret; } @@ -287,17 +298,6 @@ retry: goto start; } -static int applehttp_close(URLContext *h) -{ - AppleHTTPContext *s = h->priv_data; - - free_segment_list(s); - free_variant_list(s); - ffurl_close(s->seg_hd); - av_free(s); - return 0; -} - URLProtocol ff_applehttp_protocol = { .name = "applehttp", .url_open = applehttp_open,