From patchwork Wed Oct 23 12:59:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15919 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 46EC144A928 for ; Wed, 23 Oct 2019 16:07:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 28B0668AEBA; Wed, 23 Oct 2019 16:07:20 +0300 (EEST) 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 569AC68AEB9 for ; Wed, 23 Oct 2019 16:07:11 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id z9so21996861wrl.11 for ; Wed, 23 Oct 2019 06:07:11 -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=m4IglVqXKfoK/Mv8KeMOKeugeVsLLqvUJ90vKpwDeo4=; b=F993w+R//XJzc3AVCX4t/iAd5fKq9ICBCC1EX944JHJY4iWxtFahUK3/srR8GcHtq8 eLs5dJKK6sXl9v5zPqCKucP6OwGTVA5R8LjX1ZBHdAVHqkaA57tbqzCxlLaXkZ4y3Ut5 OESa9eR/wDvTuOWjB03KuuFaU9KEPEXFJCpcJOxtTeAHf0QEq1GyBEvrCO+hmBJ4sriL 4tyZtJv1oGRfpjIdY4ydyn5W8Qai5K6lCgxSFX76BlRBbR81NocGPnZ+yNP8mGjIrUnj bFND8jBDUHl8OOhK8GaKXOYbTr8MCMn9VPRqoO45D7bV9mdFIXyDT7R+4yTb4krMT7q/ TP4g== 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=m4IglVqXKfoK/Mv8KeMOKeugeVsLLqvUJ90vKpwDeo4=; b=rBYcm+sclKvS46IrIgwe3LhvbUcIUo7Z0/TT9jW5StITLzpTITi+aLpiBaInqK1v9/ tVP9QNMooCi2YZxRpBt5mkA814MAoVcnz97gI2W49Q464Sidyi9NgtkzuRp2A95QWhlE Nwe/IqZQ5VhoacezuQDsqiFLNMH5QJGQx9MOl4yZtjvoevInxPC2+iGMTNPSENE4TwI4 e3qJZqedmwPIH2/VzhsP6N+PPg7E93Ssjtm9/8ITlyVmYFAi+svRIUn3f2/IXyQpfTbF vPjzkQ5i2Ghh2Kz3dhw3xO32kIZpOZh8A+gwr7JIVXOrNrEkjx22fE59Nswy7Q6TxTcL ejag== X-Gm-Message-State: APjAAAUwFuGdJ8eBR4Asv3BK1qoFPtnUPH01a52CXvEo5B4H5I5AfgU3 kDGhaIZ6fBdQbh+a8lqXlA9Uur+A X-Google-Smtp-Source: APXvYqyFTKMIREH3ElOgOFnffqb3Z3LhdR2pYRMeTiLuYIZ9+RcNscADzbTlUmulDTzasOGynGFoIg== X-Received: by 2002:adf:8103:: with SMTP id 3mr8991818wrm.194.1571836030753; Wed, 23 Oct 2019 06:07:10 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 06:07:10 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Oct 2019 14:59:44 +0200 Message-Id: <20191023125944.10292-6-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 6/6] avformat/icoenc: 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 in situations where the trailer isn't written, e.g. because of errors during writing the header. Signed-off-by: Andreas Rheinhardt --- libavformat/icoenc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavformat/icoenc.c b/libavformat/icoenc.c index e641f7bdc7..975c3466bf 100644 --- a/libavformat/icoenc.c +++ b/libavformat/icoenc.c @@ -183,11 +183,16 @@ static int ico_write_trailer(AVFormatContext *s) avio_wl32(pb, ico->images[i].offset); } - av_freep(&ico->images); - return 0; } +static void ico_deinit(AVFormatContext *s) +{ + IcoMuxContext *ico = s->priv_data; + + av_freep(&ico->images); +} + AVOutputFormat ff_ico_muxer = { .name = "ico", .long_name = NULL_IF_CONFIG_SMALL("Microsoft Windows ICO"), @@ -199,5 +204,6 @@ AVOutputFormat ff_ico_muxer = { .write_header = ico_write_header, .write_packet = ico_write_packet, .write_trailer = ico_write_trailer, + .deinit = ico_deinit, .flags = AVFMT_NOTIMESTAMPS, };