From patchwork Wed Nov 8 18:17:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 5904 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1072014jah; Wed, 8 Nov 2017 10:19:06 -0800 (PST) X-Google-Smtp-Source: ABhQp+TEEnHTUv8FlJ/AHbJYu9wMS1xSk4kGXb9Q0RQqCL//BpKODot99PH4TRtcHa5Q5I16JeND X-Received: by 10.28.136.146 with SMTP id k140mr1164600wmd.147.1510165146331; Wed, 08 Nov 2017 10:19:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510165146; cv=none; d=google.com; s=arc-20160816; b=k9UmX8S7VJGFIcsedN2k2NkZQwgJA3Zy+BXxdFR/a5bmShLCUlPPkP5ku5zkv+ULIb xblfZ1MIeQ+k13djGBgRcSbf8tyWcfErgDbty29R+clb8dnQTP4fenChEGdpiqy3CrA0 VJbaOQ07gk/074n/hFwtU5JkA8ZDQ1Zk4x9yTfN2x1jj9rTX7J8yg6BvGveXJlitebzv kyMjyhYQtjRmzVJtH66zroNPNYiB8aR5Hs7Ra/rpqeHgjvz6u1caCOTfFabOkVHNBV95 FrbgP9uh7P0imOEhM6gIA2uCsqAuh0I4kw4QmSqpCYVNTKNWqta/OvjmzeNM8XGdFmCZ Aufw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=T4R+Jsm3NeAKsAJOV9c0iQ6YJSy18EWoWtaT7Ah/jQY=; b=yPka6VljdOapbO5QFCkWeMor+ydd0n7YZdnfXWhNaFdLTeZY7uDq2RAnAk3+Mu0kEl aq2W0yhou61YLjzDfEQj1SKP6h8Uc7XxWIyLFvt5enQHadTdb5YTUQYCgeNuQXxfGtSR xeGpjp6Jr+kNG0Ww0+IAUd1IT2lwqrauu2KZdYuVHvdK1xsP3ZaqsjkCP8qTiBMWNFFM mcGFNYVnxssAJpv8yDCjRwP89zcm9knPaP9OOyIxqM+ZHhs73XlZ7+9YtNf3goWynmVF 0RLVvACl69Z86OgxGV9o6JPbtZAPIbkiuYcHfwcoQOEGmUPYRbcA2gNfSN9iEPJKgF9J 6s1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=hm0NgVOo; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 189si3898088wmk.224.2017.11.08.10.19.06; Wed, 08 Nov 2017 10:19:06 -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=@rothenpieler.org header.s=mail header.b=hm0NgVOo; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6FF6C689E75; Wed, 8 Nov 2017 20:18:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [5.9.118.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7115D689E5F for ; Wed, 8 Nov 2017 20:18:01 +0200 (EET) Received: from localhost.localdomain (ip4d15a587.dynamic.kabel-deutschland.de [77.21.165.135]) by btbn.de (Postfix) with ESMTPSA id D215C11157B; Wed, 8 Nov 2017 19:18:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothenpieler.org; s=mail; t=1510165089; bh=WRD3IJxhHCJhhasmw8mnPuIFNG7y1F+u6nUbhvN3FA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hm0NgVOoxqMowZQFp67xYqGTTEblX2yP/ctUhYp+24/zCxh3calqOwDXkphM3owL8 QLSt7x6t+f39pWU2JLebHbLHp0t9hlPO3I0/LNClUegUNK42RHK16FdYX6gpA7SPAu Lz70x/ASTbmkdNuQhMkSZ7RCZ+Y2jzVMwKF95hNs= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Nov 2017 19:17:51 +0100 Message-Id: <20171108181753.6776-8-timo@rothenpieler.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171108181753.6776-1-timo@rothenpieler.org> References: <20171108181753.6776-1-timo@rothenpieler.org> Subject: [FFmpeg-devel] [PATCH 7/9] avfilter/vf_premultiply: fix memory-leak on 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 Cc: Timo Rothenpieler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes CID #1416352 --- libavfilter/vf_premultiply.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c index 1af6433bc9..4b6abc6e73 100644 --- a/libavfilter/vf_premultiply.c +++ b/libavfilter/vf_premultiply.c @@ -609,9 +609,10 @@ static int activate(AVFilterContext *ctx) int64_t pts; if ((ret = ff_inlink_consume_frame(ctx->inputs[0], &frame)) > 0) { - if ((ret = filter_frame(ctx, &out, frame, frame)) < 0) - return ret; + ret = filter_frame(ctx, &out, frame, frame); av_frame_free(&frame); + if (ret < 0) + return ret; ret = ff_filter_frame(ctx->outputs[0], out); } if (ret < 0) {