From patchwork Thu Feb 16 00:26:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 2571 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2223506vsb; Wed, 15 Feb 2017 16:26:10 -0800 (PST) X-Received: by 10.223.160.43 with SMTP id k40mr35482531wrk.24.1487204770862; Wed, 15 Feb 2017 16:26:10 -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 n90si1864534wrb.298.2017.02.15.16.26.10; Wed, 15 Feb 2017 16:26:10 -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 sp=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 63CFE689A75; Thu, 16 Feb 2017 02:26:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77DF8689A5D for ; Thu, 16 Feb 2017 02:25:56 +0200 (EET) Received: by mail-wr0-f195.google.com with SMTP id c4so230452wrd.1 for ; Wed, 15 Feb 2017 16:26:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=IuwWnGGcWVbva2PjSrMfI5Gsh8dGSjW20qPkJX8VMnI=; b=ORgaT17qrDU7eJeLOrntCMut+y0mGr2jg+C+dxKGqlAk9Xgu6ON5GbWO38PySZrTFI K5UubTPiutciTpmU7OVxSypkJylW1VO1mykuj9FiVc1dplMOk6ereE/o7LNfpx3J18zv nV12EFDbegF+4ocXpaE9lyyx8RAUDIgOPkKV+J/MFZykYiST/rXZ9NVXTPf9r240GZUX Cpn+dw3vNu0etso95aTGfHadXcxLoXEEcMlNFsucafec0DJ3uY/pBLDiajrF7YSP3p4w kHuwv2OazGjgcd0jZ22d2CQGFnVeTI5xDSQd862crpnlCcm5+j6dXajM+K1NPUoRhpSV 7+Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=IuwWnGGcWVbva2PjSrMfI5Gsh8dGSjW20qPkJX8VMnI=; b=BkEMa93w9F5eE7TKZFsoYYHsOgHoTeuq0l6ZfIUsFSqqCNWUpji4J9y+kte9AQZJV2 1QEOTJ+pemI5am6dZWZEMBz4u9ckenze29FJ/o/gkzwuB1wBKQL4CTUABnSpVfLlW7Tb 7S1T1ZatnrTkFowIaVtuMjXp/eGJF3PP6xVK6MRJA/CZ+F2t2ykAyJbxvkzzWh2kFBYY Rz3WnuN2X7GNDooJkwIyP+MZqz2S0T6Q8XI9pD9sdBwH3yhWNj3RgSeFzPnNMV/lBsSZ jNLDKivSX1sjKf6ukHuBpVjSU1m8+Nin+QwN7pZENPB9SZjDlnBBnkfidyOiEJiCSGzn SGPA== X-Gm-Message-State: AMke39kk07rZUqYLsNHW4XgZOk9vNqEDgL2vT5uoGfGklfeuWX7UErbfSTR5fRxJu46q7A== X-Received: by 10.223.139.213 with SMTP id w21mr32935365wra.108.1487204761953; Wed, 15 Feb 2017 16:26:01 -0800 (PST) Received: from [192.168.2.21] (pD9E8E0AE.dip0.t-ipconnect.de. [217.232.224.174]) by smtp.googlemail.com with ESMTPSA id b17sm1189533wma.33.2017.02.15.16.26.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2017 16:26:01 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Thu, 16 Feb 2017 01:26:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] bink: fix leaking last frame on 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" Signed-off-by: Andreas Cadhalpun --- libavcodec/bink.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/bink.c b/libavcodec/bink.c index cc55870114..91004a6ae5 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1299,10 +1299,6 @@ static av_cold int decode_init(AVCodecContext *avctx) } c->avctx = avctx; - c->last = av_frame_alloc(); - if (!c->last) - return AVERROR(ENOMEM); - if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0) return ret; @@ -1317,6 +1313,10 @@ static av_cold int decode_init(AVCodecContext *avctx) return ret; } + c->last = av_frame_alloc(); + if (!c->last) + return AVERROR(ENOMEM); + if (c->version == 'b') { if (!binkb_initialised) { binkb_calc_quant();