From patchwork Mon Feb 15 14:54:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25635 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 376AD44B636 for ; Mon, 15 Feb 2021 16:54:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 18E22687FE1; Mon, 15 Feb 2021 16:54:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6149680466 for ; Mon, 15 Feb 2021 16:54:37 +0200 (EET) Received: by mail-wm1-f42.google.com with SMTP id m1so9608798wml.2 for ; Mon, 15 Feb 2021 06:54:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=IExpure88PSjin4AJCD9HasgDDAgeDUrbqWczSlqrd4=; b=hg8/Z6y3IWYv2amBVfkD9ItlEuA9ryENz4InqI2AlV0ITReU3PIueRqo6wlMdtu3fI LYeOI6T+U+gw+wjc5zafEXypQcZdY3bB7ZDrxpxdAuPUuhd4yMCDFGz1wH27VnpG0vDt NDmH5N4d/7W73CCD+ffqrQOIkQCKIjtiB/Sg2hHf4t6PKQCt3S1UOxSeXyIVmsC5xdu2 IlQ1dT20wBni9OP3ROqqUQZ56+2HKVTfeKqRw6eXUEkUcYAkTWmbboW1voPJxVQYV+Fo oDzWNrpLpM6tUxaWKlBwOPQxL3E7AwKjaOTgXwvIKBzXjhbCYgsoZOOkjJf3nIBRL7rO ewhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=IExpure88PSjin4AJCD9HasgDDAgeDUrbqWczSlqrd4=; b=RW0paGghMuxSq7qOVWIDCkys2qnUMjfQCJjt9Rh1t8l0jL02N5klmuhwKKWQGBwWuU h7Iu5xRTb4QqSOYFvjPKP+QKgFeaXG3OP2mJov6lccAHPuwh8LX46CSEurkxVZBDFEoW ow4lJ65TFprNSlHPHn0J+21kTbo9ah2YUg5pddyYq/+zQ/aCyFk/4De/gc8p3G+Ib2FI wTGFNFkmECd+ASbvwaIye1rLAlAwCKxWUwg4BQ9xGUNED6YqHFjKkrZYHwKdjrfiUnZi aIVPw8jX+rzfjbivbkZ/QVA7gi8YOOryehazLJtaJejxtLTlxMSF4xz9QdQNxjGuW7AV nXRg== X-Gm-Message-State: AOAM532fX/tFS17cwr8Cwfhdd0vxBdQpkNdDgOYgic+jJk/VXTRtRcLb 2HE2XvJ2G/7ksJUB7/iKLiFykjpK/gk= X-Google-Smtp-Source: ABdhPJxyMkG+80fZWEIf6jVf3nLM8B4pJATdRAZ7W/OXcG7bzH72LuqSIi1Nx1UyFEyNU3l6erLjRw== X-Received: by 2002:a1c:730f:: with SMTP id d15mr14506894wmb.135.1613400877182; Mon, 15 Feb 2021 06:54:37 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id t6sm14835694wrn.96.2021.02.15.06.54.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Feb 2021 06:54:36 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Feb 2021 15:54:21 +0100 Message-Id: <20210215145423.591629-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210215142505.514125-1-andreas.rheinhardt@gmail.com> References: <20210215142505.514125-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/mpegenc: Fix leak in case trailer is never written 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/mpegenc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 810dd717ca..1204e57f04 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1262,6 +1262,11 @@ static void mpeg_mux_deinit(AVFormatContext *ctx) StreamInfo *stream = ctx->streams[i]->priv_data; if (!stream) continue; + for (PacketDesc *pkt = stream->predecode_packet; pkt; ) { + PacketDesc *tmp = pkt->next; + av_free(pkt); + pkt = tmp; + } av_fifo_freep(&stream->fifo); } }