From patchwork Sun Jan 26 10:27:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17557 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 0A1FA44B846 for ; Sun, 26 Jan 2020 12:28:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED2AF68B060; Sun, 26 Jan 2020 12:28:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A0D968AF8D for ; Sun, 26 Jan 2020 12:28:08 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id d16so7378089wre.10 for ; Sun, 26 Jan 2020 02:28:08 -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 :mime-version:content-transfer-encoding; bh=a8WPgJpcZNcjgGOuaLPcQZ9909SIW7pUPoGeA5P7GBk=; b=EDPNtQpS6AAMX7YcHTHfTkNLZIfmKOzI/J21QmKgVNTzwstu2p2mTNCH9JXcGxS1XU iw5WGPWVDguVSQ0hlCsgecj7XMpwJdnWGwXcbMX5qBKOU1XTE61Y8cOdIwG1c6IgS+uk MsixXqbFX9bqOjS1cPKkWckHyr0p4Kh6/jvVTALeDSX5Fz7iWxh3qSMJgCSed+bzbwTA s/SYhexRT8qyD0NnTtd8TMi//WldVnu+7XWQGLwcNvqYbeVl+5woBYFQeO6+W5rOmRZK QjYoaorvlhUYy2b2qP8RSFH/CLzC8mhbqhSWtTwDMRc2DhjRhsdp5YTtqaaq5wazyOkJ 4ytQ== 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:mime-version:content-transfer-encoding; bh=a8WPgJpcZNcjgGOuaLPcQZ9909SIW7pUPoGeA5P7GBk=; b=WPTaxePp1XM/IltRd2+qcCII7wTv6z4kJrR1IHYit6Zz9EYus+WuzxDTZGdxSUaheF baglCPiegE4gtovEWP1CENMbrfbqPwKq3hKyIa6jgzn/zXudyvh6TsY+7EHI9UBUlRpe rz5hWH4r07zGhAfG4MfcCdkvuQm0s6+WVJnZyw+PvW/4+00Z8SAha3QmBQev+CUL7ZdL im95s5Bvf7dJyLwDAw77ytZdVpeChdFZlW9hHEFsmIpj8QVXNRC/ewJIfLedk8B+rKZ5 oI79s6bGKBY7bNjcFiit20Vt6uqd/9m0K+VXAYNGayWk0tBbOsBLhwe/aVA7asRgqY3o eDnA== X-Gm-Message-State: APjAAAUjxmWQsNPTegL5d4MiOgOHP1rWtaX0+7miIqI6GhFCPGpIwow/ eBewTKB34N13bm1P0IAOUp+MH3OT X-Google-Smtp-Source: APXvYqyR9fV5l6iIm/NhcJoLxgUBKO07brUIUqDcLyhi6hHW9WDFPNaKp+J6yZUnnsma5eXVWvV+lA== X-Received: by 2002:adf:f5cb:: with SMTP id k11mr15338580wrp.71.1580034487533; Sun, 26 Jan 2020 02:28:07 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id p5sm15182640wrt.79.2020.01.26.02.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2020 02:28:07 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jan 2020 11:27:39 +0100 Message-Id: <20200126102739.26495-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200126102739.26495-1-andreas.rheinhardt@gmail.com> References: <20200126102739.26495-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/gxfenc: Add deinit function 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" Fixes memleaks when the trailer is never written (e.g. if the call to gxf_write_map_packet() at the end of gxf_write_header() fails). Signed-off-by: Andreas Rheinhardt --- libavformat/gxfenc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index e09b8d7625..9eebefc683 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -853,8 +853,6 @@ static int gxf_write_trailer(AVFormatContext *s) int i; int ret; - ff_audio_interleave_close(s); - gxf_write_eos_packet(pb); end = avio_tell(pb); avio_seek(pb, 0, SEEK_SET); @@ -872,10 +870,17 @@ static int gxf_write_trailer(AVFormatContext *s) avio_seek(pb, end, SEEK_SET); + return 0; +} + +static void gxf_deinit(AVFormatContext *s) +{ + GXFContext *gxf = s->priv_data; + + ff_audio_interleave_close(s); + av_freep(&gxf->flt_entries); av_freep(&gxf->map_offsets); - - return 0; } static int gxf_parse_mpeg_frame(GXFStreamContext *sc, const uint8_t *buf, int size) @@ -1025,5 +1030,6 @@ AVOutputFormat ff_gxf_muxer = { .write_header = gxf_write_header, .write_packet = gxf_write_packet, .write_trailer = gxf_write_trailer, + .deinit = gxf_deinit, .interleave_packet = gxf_interleave_packet, };