From patchwork Thu Dec 26 10:53:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16972 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 19DE3449EFF for ; Thu, 26 Dec 2019 12:54:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08E0568AB47; Thu, 26 Dec 2019 12:54:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D28A6881B7 for ; Thu, 26 Dec 2019 12:54:21 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id y11so23354616wrt.6 for ; Thu, 26 Dec 2019 02:54:21 -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=avC7Hlcl83gRVtLdERGIYAHKfl6btHvSayXfGUR9HtA=; b=CJAlh4Hs8DwWyA0wXYhA9KA3qIMgUbGMmeVhfsG9yPcGlxySOEsL39xSInky7ELVWp cRme1/ByTGp90UK/xnSPorr0CA5oEC560WE5y4xx23M1d6Fzlkvmo8A/CdXw0FEI0Pxf tERU0dbEoqelk9Mdx8oYQG60Xont2u6U8+7XoTwZP5E89oPY13X/79OMvm77vbNgbOvz qIMT+X43FaLdh+CY00FmsM9s8Q2E8iEoznywBVsMghVpUZu2845yEUbkIbUiQ0XmraGv MYBnEa5WFMtDR5X7I0OfQudFJjjRE1vzDBzMZDpuwh76HfnKkwlS9OcWRTJ9+LyhaoKH j3ig== 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=avC7Hlcl83gRVtLdERGIYAHKfl6btHvSayXfGUR9HtA=; b=dw2D6xCAxre/Z66VgmWrHJxHsYXFrkprM6WbygbmZnjrGWIaF1agyOx/CcR6jgmSza bjAeYfxgFrzL1bdi6aQM2DAMoPf8y7brZY6sd6f93ReGnbN2ylKBmS63fFfHnJ7Rgcb8 vOAqXfTte3W6Pq51lFSX1IasxiGZptmsXELKFc6SUxVeD1iQFI/OpjzoVztQE0E7HaRc E7JaIqylp8Du37hWOwiuz+5IMOtHcpz/EyZBEvy3dz7et9tVZm/mFRSvJF0JqpBJ56Cc cQHcASnTRqG1NNN/aXHi9It5sn7Z/jgWE5MOQtpalS0TrE/CFjsLtoyBwYAHIJHy4BxK ywBg== X-Gm-Message-State: APjAAAXbxFMzVrDZRMTV3fHQBg5zxeQO91WcHRC2jKWoxul4DBVCwY39 PWFs0ioOllr4uK3gzZNyc53sBKqC X-Google-Smtp-Source: APXvYqzxktySOsMcRxl4BBvPWUWhKa8tvR8qkdvbMLbilj+IRBJpl6oKoOASveLdWZBpdEkdNVuQ3g== X-Received: by 2002:a5d:5452:: with SMTP id w18mr31096630wrv.333.1577357660770; Thu, 26 Dec 2019 02:54:20 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc10203.dynamic.kabel-deutschland.de. [188.193.2.3]) by smtp.gmail.com with ESMTPSA id c68sm7997618wme.13.2019.12.26.02.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2019 02:54:19 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Dec 2019 11:53:38 +0100 Message-Id: <20191226105342.11175-13-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> References: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/17] avformat/flvenc: 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 or when shift_data() fails when writing the trailer. Signed-off-by: Andreas Rheinhardt --- libavformat/flvenc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 106be3333b..574a44eac6 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -810,8 +810,6 @@ static int flv_write_trailer(AVFormatContext *s) put_amf_double(pb, flv_posinfo[i].keyframe_timestamp); } - av_freep(&flv->filepositions); - put_amf_string(pb, ""); avio_w8(pb, AMF_END_OF_OBJECT); @@ -1078,6 +1076,14 @@ static int flv_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt) return ret; } +static void flv_deinit(AVFormatContext *s) +{ + FLVContext *flv = s->priv_data; + + av_freep(&flv->filepositions); + flv->filepositions_count = flv->filepositions_allocated = 0; +} + static const AVOption options[] = { { "flvflags", "FLV muxer flags", offsetof(FLVContext, flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" }, { "aac_seq_header_detect", "Put AAC sequence header based on stream data", 0, AV_OPT_TYPE_CONST, {.i64 = FLV_AAC_SEQ_HEADER_DETECT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" }, @@ -1107,6 +1113,7 @@ AVOutputFormat ff_flv_muxer = { .write_header = flv_write_header, .write_packet = flv_write_packet, .write_trailer = flv_write_trailer, + .deinit = flv_deinit, .check_bitstream= flv_check_bitstream, .codec_tag = (const AVCodecTag* const []) { flv_video_codec_ids, flv_audio_codec_ids, 0