Message ID | 20180320035528.2356-2-jamrial@gmail.com |
---|---|
State | Accepted |
Headers | show
Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp3409174jad; Mon, 19 Mar 2018 20:56:14 -0700 (PDT) X-Google-Smtp-Source: AG47ELvIpe232bwcyMpulylxuuCKUBR7RxNJUL93DrXN4Ojps/VPVgTaXshwqc7WMoXZmnhUJX6x X-Received: by 10.28.224.65 with SMTP id x62mr828758wmg.6.1521518174417; Mon, 19 Mar 2018 20:56:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521518174; cv=none; d=google.com; s=arc-20160816; b=C3Dxll5YZWlzXBSHrHNcRcNeit/7GBBJrq4E7cQ1HRxYOD4INhD5QRafDCVbvwjtb4 qL1WxuGmTflxwCXeu+dI7kEVvPnoEuuF9SKUM0UMc+fK3WXDLH1NGzx7KTGwe4V5kkDb eG09Ma1yANTXyYJtYvUKjs8CbylAZF1huJcW+iZrv3nIhvtLLal/4xjGGWMNUsEOdlC9 qKGWMnwcDh7LLc8qOxaXqf10TMGE6q1l6fbH/3UQTcF4/obD73gaRlW2gsHQNtqd8XF7 XfN3mgk1em8k1BqTvc1J2l8vmAvii7/cUbB4aU5CZbqCLItkmfZd742xLXW1SuZM6CCK 9kJQ== 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: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=yaz7DxMclsRcLLHdRbdZuYuuHgQZNCYTTGpGuc3yvhQ=; b=g8ePg21FqhPGRhq+1FO+QtQJXaA5Qz64amYAN5pQUkWtmd/xVe/Gdl0jIgqg/mC737 dcw8CQPuP8XgvUvBOYWawu6Uf33V4dRZ9aXdjkp9u79+/+1NHTXs2g4kMDv1LCoDx7Pw y0F+4UajQnZhsGNL5Pnn09IFAWkCmdbbUslhBQdWOkaj/n7p2TwGLxmmZsF5qd8hxrOH 2c4mQWX47tJ9MEHlcNLVEYnTM6/Q6ck4M73OoND3ffnGn1tfly/kJ6Km10ok5fV16Y9F hmMN9MJ9VrcZKw9Ck5vajlh47mgQSbB7WZ1285xKnfkSQKOZlv6lwc1RhPcU//ZW7H52 Q2BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ilXD9jcl; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m14si596170wrg.270.2018.03.19.20.56.13; Mon, 19 Mar 2018 20:56:14 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=ilXD9jcl; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D6D7368A200; Tue, 20 Mar 2018 05:55:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F5C468A1CB for <ffmpeg-devel@ffmpeg.org>; Tue, 20 Mar 2018 05:55:41 +0200 (EET) Received: by mail-qt0-f196.google.com with SMTP id q11so247418qtl.9 for <ffmpeg-devel@ffmpeg.org>; Mon, 19 Mar 2018 20:55:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=bLRRh4yKwpy20HepTTarC0QoBad7VPvm9zsg2iSB638=; b=ilXD9jclxrhuRVOEOltmWQiWtCyioUYtd1baK1B9budLfgBjVqrNdOMoBTyqTV0i8k BGT0pH7wM1D9uW+CRrC0oBTZgWQuCKare25we98dJTQx1bNlYVmR1gL0IkcenPSGQEZe kswx02cG+kz4WYzj0Fv9VvXDBf9sbgPIfo4LTukn9dwF1MO4OE+8UPXrv8ow56dWG2mG InUDJwxY8rCcQNYD/dlSsE+B0PmXUAhcD3dwNChg+73DySMSw4kENyMzUQLt+Hc5LnxU jmtYvyRWbGn9C1xBO6Nq0aJUR0aaPL798bznCW1VPqjifXc3KknQqbFgfcZTG3yoogz+ 8UXg== 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:date:message-id:in-reply-to :references; bh=bLRRh4yKwpy20HepTTarC0QoBad7VPvm9zsg2iSB638=; b=g1bQNqdPeW2Yn0rXzQZS3cFnoLLNMqQlRKCCcOvie5jaKSpSOUgprFJ021lqA2mE3+ ZULDw/wvJLn8vewaCYhVfgg+u27hU6yxujgJWU2QcPW0uasLjGCAY+xlxeZBP+CNlEwL 1wSKHkawP9O+RVuxe/WD7rVvfVhC/VUlLBHaUowkDPRvF7q7bJfX7+gs7iIyovq5KTtz wPP1S86z4pyla/0daijwlYQYGRqJI/K9usV0TgSriBXDIURIlfzZMXsBm++7pbigKSWB J+xJsW4DZT6lmrRZtPbj6rrggW2so8d4aHaNDmsRIGhFt3KyPBtyP13zfZmA+1MNRSth zcCA== X-Gm-Message-State: AElRT7H0llVQyu4cTqAo1q+HDXECVqM423z7i/vbxtWNUBVe6LLXvl84 ikCurId8qV+xGLNrItkxPltYYw== X-Received: by 10.200.14.5 with SMTP id a5mr22724427qti.7.1521518154831; Mon, 19 Mar 2018 20:55:54 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id t68sm1067048qkf.62.2018.03.19.20.55.53 for <ffmpeg-devel@ffmpeg.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Mar 2018 20:55:54 -0700 (PDT) From: James Almer <jamrial@gmail.com> To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Mar 2018 00:55:27 -0300 Message-Id: <20180320035528.2356-2-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320035528.2356-1-jamrial@gmail.com> References: <20180320035528.2356-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/h265_metadata: fix memory leak in case of output packet creation failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <http://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <http://ffmpeg.org/pipermail/ffmpeg-devel/> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <http://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> |
diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/h265_metadata_bsf.c index 8759e410f3..59ea67f718 100644 --- a/libavcodec/h265_metadata_bsf.c +++ b/libavcodec/h265_metadata_bsf.c @@ -324,6 +324,8 @@ static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *out) fail: ff_cbs_fragment_uninit(ctx->cbc, au); + if (err < 0) + av_packet_unref(&out); av_packet_free(&in); return err;
Some function calls may fail after the output packet is initialized. Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/h265_metadata_bsf.c | 2 ++ 1 file changed, 2 insertions(+)