From patchwork Wed Oct 23 12:59:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15914 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 9827D44A919 for ; Wed, 23 Oct 2019 16:05:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 714EE68AD4A; Wed, 23 Oct 2019 16:05:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99B1268A87F for ; Wed, 23 Oct 2019 16:05:39 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id v3so6297122wmh.1 for ; Wed, 23 Oct 2019 06:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KrIwmKvfrO6zMUeTgmUGGPIiwCJNzK1KjhRa0CP8Pks=; b=LeRClfIoEdc0QCv4qzRsCOm4J8lfK2CR1Ly5ToiOTueUArV0nbVkGWN54+R9degHXE ZyYt+Cru8Q36RPJdP21VZKtgk2aj99QfoArwkSIaQ+B12I65NLfYey5OtnR6vVlc1xwS lOPryRRL9Ua0A20v7ea5iNWni2FjW2fGuMpqM6B/4zUMwX0RJR9fJ0nYXwCI8/+FScpw HJ2n8AvlO7fiMI+O5rMQ5pyewwJiy+OZXjIHyv3oE6W8eh+qCsOtn0IG2ZNFXrE+peMJ iLHVRy1NckTHnq2HgCtRDbrqburmp4V10Kllt8FvdTGAO/nUJ64E1lDJk0n4eQ03Kk9K P4eA== 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:mime-version :content-transfer-encoding; bh=KrIwmKvfrO6zMUeTgmUGGPIiwCJNzK1KjhRa0CP8Pks=; b=pAjoN+6fkMcZcD9qF0BX7yOz+hZC1WXfK7qIAefHvYXjcA5ZVqph64whHWTpxM+U1m G3HLeCmUNQs3dfvIwnKcunuTpoxlJr48/hjdBrT5wv799i8+sEAjy+KcKNKau/HIZPBR NnPn9mDqCSvUz/oU0i37KwYUHEFZCO3t/bWLT7SUHRaHvf68L3JF1Xysi2Khedi02zy0 p/Gupys/5TlFIhXYhtlim2ZNg/0tVbNkdjifJuD2xoHha7+StpbOInOZyxCxfmYBF91v d1jDuoxrnmK4X01AdU7xJZHzZSC0tbCFG2kPZku1BT+WYCcTmcuT/itBviUTP03QvRxW 1KMg== X-Gm-Message-State: APjAAAVBPGHB/4apUi3Nfh9q+nTAbhRgwozoWK4cJlVMc8FyUalyWVCP mlKXeOZZB/tA540GBaRNcmB6ZXBI X-Google-Smtp-Source: APXvYqx+49urTRbD5lq0UUEif/e5ooebNPDB0kAErAtEk+IQvj6IghJM6g0s41OIfG/62EV8VcrLaA== X-Received: by 2002:a05:600c:214:: with SMTP id 20mr8058936wmi.45.1571835593236; Wed, 23 Oct 2019 05:59:53 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id c144sm5303125wmd.1.2019.10.23.05.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 05:59:52 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Oct 2019 14:59:39 +0200 Message-Id: <20191023125944.10292-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] avformat/aiffenc: 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" Prevents memleaks if the trailer is never written. Signed-off-by: Andreas Rheinhardt --- libavformat/aiffenc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index d09c9afb95..4f24c2a28c 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -1,3 +1,4 @@ + /* * AIFF/AIFF-C muxer * Copyright (c) 2006 Patrick Guimond @@ -260,7 +261,7 @@ static int aiff_write_trailer(AVFormatContext *s) /* Write ID3 tags */ if (aiff->write_id3v2) if ((ret = put_id3v2_tags(s, aiff)) < 0) - goto free; + return ret; /* File length */ file_size = avio_tell(pb); @@ -270,12 +271,16 @@ static int aiff_write_trailer(AVFormatContext *s) avio_flush(pb); } -free: - ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end); - return ret; } +static void aiff_deinit(AVFormatContext *s) +{ + AIFFOutputContext *aiff = s->priv_data; + + ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end); +} + #define OFFSET(x) offsetof(AIFFOutputContext, x) #define ENC AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { @@ -304,6 +309,7 @@ AVOutputFormat ff_aiff_muxer = { .write_header = aiff_write_header, .write_packet = aiff_write_packet, .write_trailer = aiff_write_trailer, + .deinit = aiff_deinit, .codec_tag = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 }, .priv_class = &aiff_muxer_class, };