From patchwork Mon Dec 5 20:51:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1690 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1832199vsa; Mon, 5 Dec 2016 12:51:43 -0800 (PST) X-Received: by 10.194.9.8 with SMTP id v8mr16670422wja.140.1480971103195; Mon, 05 Dec 2016 12:51:43 -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 n128si351686wmf.141.2016.12.05.12.51.42; Mon, 05 Dec 2016 12:51:43 -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 BB7E3689F86; Mon, 5 Dec 2016 22:51:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f194.google.com (mail-wj0-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7AD35689A06 for ; Mon, 5 Dec 2016 22:51:24 +0200 (EET) Received: by mail-wj0-f194.google.com with SMTP id xy5so41049076wjc.1 for ; Mon, 05 Dec 2016 12:51:34 -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=jTunTkppjnEinrANrjiOIUQAWkicO4W1y1u+GPEozFA=; b=vEWkrrmW60b8xfeebRZtIpy5RrQ1LKV2xjHLd1TqBcICOKFeENGFiihnnzY5LsbxVj /ARW5TukgBhyl9oEH/FU/k6/6Bod/gaUOSA9WBzsGtsME4J6INRhv7yzAg2wS/diR/OH YjK2j9hxwOD7bci8sYB4fZZuo0fJOFs8hHVe6bB4U7SAVkKWS1o5oTJUrlUuZLTbOH+3 vJ+DQi3QzDzbuwgPeK8Glnkh/FZt3JfM1Ylh8MBk/VqwdfOXP8ycx1iuGb9+TNZew8nn a+zxoE9dBXNbwd2af+bYcj605n8CyKWQv07HX7lhokLTN0rblI1O9Dua73Q7i6gL7XQO dRGQ== 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=jTunTkppjnEinrANrjiOIUQAWkicO4W1y1u+GPEozFA=; b=W7xuTUcyeQO3yku0Ba5Gwqr3tZuKKBfiCFgSwZaRUJJpFt27BsfX6QklFqyKEjcY+u Kb3drakI16kb25pZEoyaE4QZpJ5JxeL1OnWQ5I1SxmjOBdrL75bGQzDcOQUcpIwzMtSk 3kqJDC4An031rIyrxZ6guMhKTmpEArtze7Rg9nixc1fNEjND35/Sd50zIpJuwpY/TQxD KfDujpBvqNe6LexIoR5ARbbecX8Q9fPUN+NdnkCN6objJSI5j4a3NoEVDNlAhlOY3gqB fQbRr/uk59bEFIet/p+3IF008neBveCTC7d/PtFyhUbDAPX4kbmxBiykAovIC1VUma5p vM6Q== X-Gm-Message-State: AKaTC00qm14hwDapF1FWbRAI7fcjBSFcPdyv4Xc8LmywiQnU60bau2E2Etnro/H2yUkI0Q== X-Received: by 10.194.221.131 with SMTP id qe3mr26134587wjc.133.1480971093526; Mon, 05 Dec 2016 12:51:33 -0800 (PST) Received: from [192.168.2.21] (p5B095538.dip0.t-ipconnect.de. [91.9.85.56]) by smtp.googlemail.com with ESMTPSA id l67sm557309wmf.0.2016.12.05.12.51.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Dec 2016 12:51:33 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <2479dc14-822e-867e-017f-969c87de5914@googlemail.com> Date: Mon, 5 Dec 2016 21:51:31 +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] truemotion1: fix leaking frame on init failure 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/truemotion1.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index da843c4..c2022fb 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -489,8 +489,10 @@ static av_cold int truemotion1_decode_init(AVCodecContext *avctx) /* there is a vertical predictor for each pixel in a line; each vertical * predictor is 0 to start with */ av_fast_malloc(&s->vert_pred, &s->vert_pred_size, s->avctx->width * sizeof(unsigned int)); - if (!s->vert_pred) + if (!s->vert_pred) { + av_frame_free(&s->frame); return AVERROR(ENOMEM); + } return 0; }