From patchwork Wed Oct 23 12:59:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15916 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 33D2C44A928 for ; Wed, 23 Oct 2019 16:07:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2055868ABEF; Wed, 23 Oct 2019 16:07:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5BAE68A671 for ; Wed, 23 Oct 2019 16:07:08 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id g7so3101878wmk.4 for ; Wed, 23 Oct 2019 06:07:08 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=UukBESf1OKDoiBBEeuz2GbXrZQ+tOp31NcuYS9Z5Qac=; b=OaVN7mx5AHab6jTwZl/ZvTOe8KNFY0VaKAnTidXYIjOva+f5hODNjddvW+sqGwB1Pm 06WnyelfhZ//f5YEA8IImvKt6O21cfnBHgJBEXfwkM4pS1dcC5O6P78TlL9oICSFJC4l zXNqu27E9CiqpUqihM0RPZeIxeMLAjZhaWHfoZpSa106cWwtdITM64S5IDkz353tYDDR DA7hPLs4jrHKAtLxR1grFENYTwMSm6c65eobHVOap038a8iPqqMPX15n5zNrU+yWcfKA JekHjlEiqlaQE7Fquq+NzBtFnx11jSxsk3WkIXdbS41QE3zgH0up9aoiZ/rEcEgyDtMN yKLw== 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=UukBESf1OKDoiBBEeuz2GbXrZQ+tOp31NcuYS9Z5Qac=; b=IF5SO1KWoxXtft7jAJMn/oIrzIPWIcz2AQRhPDwdY2h28qEqnH+dbwZpKK8ED9bW7Y EBWbZ9q7gFByw2pPHjiL4i189jYWUSWCp2CQFPCbxfknmS3l9t/bKFdfJkp2nQs24IUe mgrjU9eJ8+jNnH87dtoTKS+9xuA5aj9tch4cJ+XJPG2abeu2PomeVjY9wsI+WoXMpMCB AcK0cxgUqYFAqq2uTwfiTnXFdA2gpm9a6JEKk4UtCzpP4gfdyycF4VC5fIiyHWx6a1xb wFqXqeXOxAUl2M0n0pnLEjjNElHFlKigUqMXGuj845PLopt4/8d5PEqaECufrVWK5laT 7FFg== X-Gm-Message-State: APjAAAW3E3AiyS5/mYnAoj8BFwVE5NqrOzoIsUL4K4CDCZ5mp9tWYNWe mGK0HJX0couT8bAKqd7w0aLjAKp+ X-Google-Smtp-Source: APXvYqy+ZHgtFMD3EsiK1p3OjhoHfCGeELVbTAgvpUhG4+P4woLarR7BxF2h0tXOe2pic+OjjtWwHQ== X-Received: by 2002:a1c:9cc6:: with SMTP id f189mr8449716wme.80.1571836028108; Wed, 23 Oct 2019 06:07:08 -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.06.07.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 06:07:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Oct 2019 14:59:41 +0200 Message-Id: <20191023125944.10292-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191023125944.10292-1-andreas.rheinhardt@gmail.com> References: <20191023125944.10292-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] avformat/apngenc: 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 (e.g. when there was a write error when writing the header). Signed-off-by: Andreas Rheinhardt --- libavformat/apngenc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index 77c1c916c2..88cd8054d6 100644 --- a/libavformat/apngenc.c +++ b/libavformat/apngenc.c @@ -251,7 +251,6 @@ static int apng_write_trailer(AVFormatContext *format_context) if (apng->prev_packet) { ret = flush_packet(format_context, NULL); - av_freep(&apng->prev_packet); if (ret < 0) return ret; } @@ -266,12 +265,18 @@ static int apng_write_trailer(AVFormatContext *format_context) apng_write_chunk(io_context, MKBETAG('a', 'c', 'T', 'L'), buf, 8); } - av_freep(&apng->extra_data); - apng->extra_data = 0; - return 0; } +static void apng_deinit(AVFormatContext *s) +{ + APNGMuxContext *apng = s->priv_data; + + av_packet_free(&apng->prev_packet); + av_freep(&apng->extra_data); + apng->extra_data_size = 0; +} + #define OFFSET(x) offsetof(APNGMuxContext, x) #define ENC AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { @@ -300,6 +305,7 @@ AVOutputFormat ff_apng_muxer = { .write_header = apng_write_header, .write_packet = apng_write_packet, .write_trailer = apng_write_trailer, + .deinit = apng_deinit, .priv_class = &apng_muxer_class, .flags = AVFMT_VARIABLE_FPS, };