From patchwork Tue Jan 14 03:13:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17339 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 1A9EC44BB86 for ; Tue, 14 Jan 2020 05:14:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0705F68B0C1; Tue, 14 Jan 2020 05:14:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDD3368B053 for ; Tue, 14 Jan 2020 05:14:01 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id p17so12038599wmb.0 for ; Mon, 13 Jan 2020 19:14:01 -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=fU//RFRMN5oIqqKrv3wqCbcguiKYw1Ri8hJ1lmphkW8=; b=UUgtT1B+aw3yr78wJcrCg8cpql/6mvLTj+PoiATRDmImnBTyemvhdj4WMBkvv5J+O2 JVwM3E97pwGjCszAockFQ4Pl7F30J5ze3h+SwWsgnGO8Qch72dwsKrZ4cNPJ/1VcR+Gw blK2eGE9JvAePUfQMn8vRcCNiwq8Dcw0ZrzPuwfi7uQCpI1PggFgJkd4/05Yc0GzSHZC jSKtfeIb1ZrP8ClsBqMNv2cTwuWABg+jb/NuGsdMrmJgd4R07/pQo+zozSN0Y1JtbZGd OC4ifX944JeWLU1mFi9YR8P9FiCTjOxGwINy3jdz+zdvcGcgzQekmF+vA6M5c8e7rVlp 7qsg== 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=fU//RFRMN5oIqqKrv3wqCbcguiKYw1Ri8hJ1lmphkW8=; b=ugA2L/J0LCftUXEgTmfBJ4z6XE6Z5+endy9i/QTdcZoVH7T2ZKmOs8U3GG2yH2Gfqw 3rJpF8xu09R0mxC8lZr4E6wpJNd5rt7o87DGzK9jMRH5h2Vl8thIe6kyr5D7UAypfO3J 2E3wJXoBWiTeVXenjPQE9Npjm2paKpL6kcL07lgoXBB80kdzc9b4J56DIfSn5QYlqTFU DfkMtS/v+wt7z62IHoQD9C/hgSk1Nt2ED5SHYfXxc+J9Z+7T6AZGq8U0sBEjpIBszHEE Poszl82NzGsb/FG9iHKerDlP4SgPjaH3m96eHnl2hizfnE/rXEBAruJE4ustRbTS079Q szSg== X-Gm-Message-State: APjAAAWxgNlnm3P7Nr4vCttHhdjbfXIUlt5W6HddtPPVCIvZeiMd5ZTY s4E+mEfP8giU7KhV4ELGS46zVizW X-Google-Smtp-Source: APXvYqw+LDc0onIHKlEpDCcLSr83USO9bQUfZ1axSFUL+AsKsl/SY06fIIvxg8jVjsWRAg2erBfhJQ== X-Received: by 2002:a7b:cb0d:: with SMTP id u13mr24877899wmj.68.1578971641118; Mon, 13 Jan 2020 19:14:01 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id w20sm16588476wmk.34.2020.01.13.19.14.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jan 2020 19:14:00 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jan 2020 04:13:36 +0100 Message-Id: <20200114031336.24096-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200114031336.24096-1-andreas.rheinhardt@gmail.com> References: <20200114031336.24096-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] avformat/segafilmenc: 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 when the trailer is never written or when shifting the data fails when writing the trailer. Signed-off-by: Andreas Rheinhardt --- libavformat/segafilmenc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavformat/segafilmenc.c b/libavformat/segafilmenc.c index 137f153331..6b66c68328 100644 --- a/libavformat/segafilmenc.c +++ b/libavformat/segafilmenc.c @@ -360,10 +360,23 @@ static int film_write_header(AVFormatContext *format_context) packet = packet->next; av_freep(&prev); } + film->start = film->last = NULL; return 0; } +static void film_deinit(AVFormatContext *format_context) +{ + FILMOutputContext *film = format_context->priv_data; + FILMPacket *packet = film->start; + while (packet != NULL) { + FILMPacket *next = packet->next; + av_free(packet); + packet = next; + } + film->start = film->last = NULL; +} + AVOutputFormat ff_segafilm_muxer = { .name = "film_cpk", .long_name = NULL_IF_CONFIG_SMALL("Sega FILM / CPK"), @@ -374,4 +387,5 @@ AVOutputFormat ff_segafilm_muxer = { .init = film_init, .write_trailer = film_write_header, .write_packet = film_write_packet, + .deinit = film_deinit, };