From patchwork Sun Nov 6 23:11:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1321 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp856655vsb; Sun, 6 Nov 2016 15:11:36 -0800 (PST) X-Received: by 10.28.1.135 with SMTP id 129mr7124617wmb.108.1478473896301; Sun, 06 Nov 2016 15:11:36 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a196si7505050wmd.119.2016.11.06.15.11.35; Sun, 06 Nov 2016 15:11:36 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B7CDF689218; Mon, 7 Nov 2016 01:11:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8FFD68047F for ; Mon, 7 Nov 2016 01:11:23 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id p190so13681367wmp.1 for ; Sun, 06 Nov 2016 15:11:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=nUqJ7TRxhZ1omNR/7Yg5uLvunIg4Ju6L3V9Of1dUVtg=; b=dv3C4V6W0RoH59KnczqSiRNS0ye3zlr3W8ML/yCml+avGTQ26UgrID15q6kT8HjvR5 Euqvoy9zlmEB7wcKUMxxOliU+jD6ehkVInUilTq3flWRGttpMdBLO4Y9bLIuVpyDBpva Y6Q45ZS+y1SGZtmOh57m6NkidIyYzVB378TFzYsCIQZ0Ayz19WO+fLTXe3wC3Rhr2Kgt V79EX27iT+MRov8iPfu5HoGR2ZAusNY0SF6ckF3dr9OvCjgdwLfh9MxmGe4G6FdRVfmd WELNYeTMoHCCFFmGW+9NWxUKP45cCzH59nv9ESwNuGawQAYx4poHbxnBnsIjgIZ3Q6Vk CyiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=nUqJ7TRxhZ1omNR/7Yg5uLvunIg4Ju6L3V9Of1dUVtg=; b=kXP1sLkx9LjemIQUKnqwRiArQuJvEJXlWLNa5IzKtz+WeYOYZp/kpy6G6Fkd0qGGpu 4t3xAw9qLO8PozXwTolV9ZuOkevjYHGogjxNYgL1zW8c7EGgjNPd0P9OTfa5WUtzAj7F VKyogLlQJzG12NmAszSlznbUNpDGbGqnvCBS5EQkRT1ZNqQ3Iun0gm0mwCgXomd3ut0u nWSpFyvys2hXTlWKbk7I0QWj3Cp17Krbc+wCtmwwCEtijiXG9QjdDcQpaNtP5or8183u iSxgUgX/z8pUXbc9U6GGhKz0R2KFwjEjTm54BnyLV2cppL+Pwb5QcmCmrxD2zKMfrqDY 8jSQ== X-Gm-Message-State: ABUngve1pn+QqpDjvjI/pifc2H0zmf/cGLgMMiFW7SN81p+xjVNosfXXsNlr/gjT5HUPIQ== X-Received: by 10.28.72.198 with SMTP id v189mr4385334wma.13.1478473886714; Sun, 06 Nov 2016 15:11:26 -0800 (PST) Received: from [192.168.2.21] (p5B072D05.dip0.t-ipconnect.de. [91.7.45.5]) by smtp.googlemail.com with ESMTPSA id 129sm10019800wmq.9.2016.11.06.15.11.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Nov 2016 15:11:26 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Mon, 7 Nov 2016 00:11:25 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] hls: fix leaking avio_opts on hls_read_header error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Use the hls_close function to reduce code duplication. Signed-off-by: Andreas Cadhalpun --- libavformat/hls.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 2bf86fa..3ae3c7c 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1593,6 +1593,19 @@ static void update_noheader_flag(AVFormatContext *s) s->ctx_flags &= ~AVFMTCTX_NOHEADER; } +static int hls_close(AVFormatContext *s) +{ + HLSContext *c = s->priv_data; + + free_playlist_list(c); + free_variant_list(c); + free_rendition_list(c); + + av_dict_free(&c->avio_opts); + + return 0; +} + static int hls_read_header(AVFormatContext *s) { void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb; @@ -1794,9 +1807,7 @@ static int hls_read_header(AVFormatContext *s) return 0; fail: - free_playlist_list(c); - free_variant_list(c); - free_rendition_list(c); + hls_close(s); return ret; } @@ -2013,19 +2024,6 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_EOF; } -static int hls_close(AVFormatContext *s) -{ - HLSContext *c = s->priv_data; - - free_playlist_list(c); - free_variant_list(c); - free_rendition_list(c); - - av_dict_free(&c->avio_opts); - - return 0; -} - static int hls_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) {