From patchwork Tue Mar 20 03:55:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 8053 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp3409259jad; Mon, 19 Mar 2018 20:56:22 -0700 (PDT) X-Google-Smtp-Source: AG47ELtIEfw7osfMksfd9vSG5S1HhRR7t+wS2bcTY2HgK3BcLtAaH0UizawwpyTnyFrkhfrhYqNv X-Received: by 10.223.139.68 with SMTP id v4mr11942284wra.23.1521518182696; Mon, 19 Mar 2018 20:56:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521518182; cv=none; d=google.com; s=arc-20160816; b=BTOkH7FuMyYKvQSLEcftv9XK10hIcqwqptXgkbeN9IOmD4gvkJdrUXEpny1yspTSpd F+aVSsr3dsS7N/AOeKGy1TqA9r9o+ns7NF9eGgddTA+0ndeXyD6GSDo9sLQBy7pHuxUb yR1MvLltYsUV3FE8UqpZkOiKghBgZrFpFx/LQzKem81P+NUqeRGFXbClebNTrPH50KC5 9W1Sm0mBSi4dSyVS/y94nNnhwU6xslAjnWXlmoin4O6WqaDvBCR0vae3lCXLShferd2H NTr0SUmBB1iMTlgnkb9brLdsMM3EEC0OXKq5NJdPnOxjBEAAKM/5tsYdRVhnNCw2vMFW n2Fw== 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=tEYHLtTlX/X20cb3xEim6++pTrBkbDQJw4qvc0Ilne0=; b=csBzCl+Ov3UuRXPrLy3G3NrkIB2jSLIp7KhaVN8Zltj8aqb96U2WHsO44Brm7/x8a0 uBkpAngxMdq5uutqEIeoXBcdydvaPmZPhMEpVsQUd6lDHqlT7jN8ZdRDI3lm4wtzsqdT kvut8M8sEGrRhNurwUHPLpMxQ7IsUz6Q7KxOTfkUHDA/TVKbrJ2xHMD3jrTX2czvYkIu NnVkUlJG1pXjC0tAuZ1b+fdTp/pBdERWOsf5gDxTf8KQdpoft0zEDVghXASH4jWPK7Pz jLTTysaVgKwhWa9xZW2snbnvd68XT0TsowbHy6v7k+U64FOpRRyZtBXSIi8EPhdoFE5o IgHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mLNiHvKK; 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: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u22si551828wma.63.2018.03.19.20.56.22; Mon, 19 Mar 2018 20:56:22 -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=mLNiHvKK; 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 6D96368A20E; Tue, 20 Mar 2018 05:55:49 +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 B702D68A1FA for ; Tue, 20 Mar 2018 05:55:42 +0200 (EET) Received: by mail-qt0-f196.google.com with SMTP id j26so243254qtl.11 for ; Mon, 19 Mar 2018 20:55:57 -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=23O6tgiIbyAAPTS6bISyoABHprSIKcSpBfIsd4VwM6E=; b=mLNiHvKKlXY2ROj3rbW3WTtAkihyhI+1I4KaTJ+da+CyRaskzTQOkRfzaGLY8YQSeC DTzf7tMB7vwKstGRhwwoPR8g1t3ERl9giTIqHyUY/SiGPNHE3jxlv/zMuukXpQ+RFP16 mFFO5tZtcgF4+ZSFJLHnNFOp4KeOuGik7J1593aWXcxPnah4SNBYHTIT/SyB+xQYbjQd olQxkaA3rGp1X57n3vMC3VcyyQvrA2b9j3uG26jxDjprFCENkSXcbZDH1swW7zfxDZfb 1f2SCIcmkNUXECO8cHSJ6K9LkdPkwrypknvcsS+bYw1rI61qd7HycOKUxXeZkfHb1QwQ OoOA== 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=23O6tgiIbyAAPTS6bISyoABHprSIKcSpBfIsd4VwM6E=; b=FZyR5Xuz1agh/s2LNuia1e6AUcSVKoXfgHizW/1xOc2IDjjXnnQ/kNeqDi635cRo6y iBqXa4HimZ4h41FZQsXtfPs+8mcgSMnCZnzC6jtf4Tjd59Lbbq/FZxEDbZz7DQKDVlPm Rdrd4G9I1siFaA7OAlYTUfWTAjENxVPoFDKVJC0/GPe93bWqO3VfVdE6SozjU0pRQEl8 nYvgkfXn3Z1vN9vsLC94u+xYcuNNig1vaGDubKncgPAGqH8AiLGb8gynWo2zszXewj1h 9UHoEQeoZ9NbzHMFSt1KF3nacyqTLPEADV6LKGZmcVcG7CwdVErFzWbnJHkt744/EpjB LwPQ== X-Gm-Message-State: AElRT7FzNLYxx1k7NfFcdMKPBWP3S1IqAwPvNsROPRUP/9dGksOx+Xe1 Ta+20dl4TPsbXs0JM0q5I7DIww== X-Received: by 10.237.32.226 with SMTP id 89mr22703490qtb.150.1521518155921; Mon, 19 Mar 2018 20:55:55 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id t68sm1067048qkf.62.2018.03.19.20.55.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Mar 2018 20:55:55 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Mar 2018 00:55:28 -0300 Message-Id: <20180320035528.2356-3-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 3/3] avcodec/mpeg2_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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Some function calls may fail after the output packet is initialized. Signed-off-by: James Almer --- libavcodec/mpeg2_metadata_bsf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/mpeg2_metadata_bsf.c index 6d5f581ab1..aa447db0b8 100644 --- a/libavcodec/mpeg2_metadata_bsf.c +++ b/libavcodec/mpeg2_metadata_bsf.c @@ -218,6 +218,8 @@ static int mpeg2_metadata_filter(AVBSFContext *bsf, AVPacket *out) fail: ff_cbs_fragment_uninit(ctx->cbc, frag); + if (err < 0) + av_packet_unref(&out); av_packet_free(&in); return err;