From patchwork Tue Nov 8 23:00:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1354 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1948470vsb; Tue, 8 Nov 2016 15:00:19 -0800 (PST) X-Received: by 10.194.172.3 with SMTP id ay3mr12188623wjc.84.1478646019857; Tue, 08 Nov 2016 15:00:19 -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 w62si18327808wme.143.2016.11.08.15.00.19; Tue, 08 Nov 2016 15:00:19 -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 DF79A689B50; Wed, 9 Nov 2016 01:00:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48657689731 for ; Wed, 9 Nov 2016 01:00:07 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id p190so25709889wmp.1 for ; Tue, 08 Nov 2016 15:00:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=AfPMRlG765IVLIv9tunj+gXnYeSIHeTbfUC5vyti/G0=; b=dP/OJhjXY0AWG5Wq1+OUQP5/3pxzmA1iXZVOZhWq1xl2/Qd/ED6W6eO64GAgR+t8e1 ECUdcq/+k2dUlF5exDDgPHO9Z1uprd6DXhYBNwlJBQScLkZEXLdw7NFy0nIkrmvZbOd/ 4aFzUDcOYxerZmzS8vHljVLfV1KU1l2heuWNY7KCPvE/R5U9V13v2C79vkLPo8tnz5Yj eZtfQdCeXNfgI1JpVdCvs34Sh1Dbh0IpGWAdxhoOZXXJEpKLzi6ugx2rUtEkatBE/rGS zu1pdkKojrPKM5EPMiz5gy/6gPC/pgmArzP3R9JbcwunZO8LjNe4tuOvGseisLageumv Nd8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=AfPMRlG765IVLIv9tunj+gXnYeSIHeTbfUC5vyti/G0=; b=k/d6szc+UIO9T7pmIgIa1zqYNSnBxW7+gw0/0ZnAuDqYebdoiHYSH3l7dIefcCvkYD VsNV+5pf9bTcy7Zn3VQkakIOL4caSEgfFxLW6+2/GylO2KUuK05w5Dpr4dFfG5twcuv+ YVFjtdcDQAy82rmkzqQlExV7ppgMLZ8Gbwkfhw4dRmPtiKAM+Nnvfo46sTurGO0a0un+ KehnwBBP/4CMOGUbuHgaD76pnBIJSZ47VgAGpfzXEDn0KXvAGfU0rmGZ8fNdchQylKRi U17ReU+TrPwYMBkeRZwyAIvY7Z0z3d2J3jYE27ZABZkEuJ42p5ip0ELepY5FnoMnbqll 3cNQ== X-Gm-Message-State: ABUngvflynJpxi7ghPI3WgypQYklDJ8rURgkXfmEF6qwbqzJFO4yK3kYvLZja5xu60Lg0A== X-Received: by 10.194.22.170 with SMTP id e10mr9664350wjf.125.1478646010315; Tue, 08 Nov 2016 15:00:10 -0800 (PST) Received: from [192.168.2.21] (pD9E8FF48.dip0.t-ipconnect.de. [217.232.255.72]) by smtp.googlemail.com with ESMTPSA id js10sm22172088wjb.19.2016.11.08.15.00.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Nov 2016 15:00:09 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: <5d4d54f0-b35a-ca27-6ce6-58f2f919c3f6@googlemail.com> Message-ID: <90f96d35-cd83-ce77-6f37-c3a80c34f8fe@googlemail.com> Date: Wed, 9 Nov 2016 00:00:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <5d4d54f0-b35a-ca27-6ce6-58f2f919c3f6@googlemail.com> Subject: [FFmpeg-devel] [PATCH 2/2] iocodec: add ico_read_close to fix leaking ico->images 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" Signed-off-by: Andreas Cadhalpun --- libavformat/icodec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/icodec.c b/libavformat/icodec.c index becbc0f..1d8e383 100644 --- a/libavformat/icodec.c +++ b/libavformat/icodec.c @@ -199,6 +199,13 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) return 0; } +static int ico_read_close(AVFormatContext * s) +{ + IcoDemuxContext *ico = s->priv_data; + av_freep(&ico->images); + return 0; +} + AVInputFormat ff_ico_demuxer = { .name = "ico", .long_name = NULL_IF_CONFIG_SMALL("Microsoft Windows ICO"), @@ -206,5 +213,6 @@ AVInputFormat ff_ico_demuxer = { .read_probe = probe, .read_header = read_header, .read_packet = read_packet, + .read_close = ico_read_close, .flags = AVFMT_NOTIMESTAMPS, };