From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 05C4C43A0D for ; Tue, 5 Jul 2022 20:27:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D1C4368B95E; Tue, 5 Jul 2022 23:27:09 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2022.outbound.protection.outlook.com [40.92.89.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AACB68B898 for ; Tue, 5 Jul 2022 23:27:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dkTYEfpDF1qWO0V88y+dVMX/hNsTMnGwKKL+UuXd/KYZcPurcNN1bSlbPqNHG+n71AfVOy5wNVdQ/9ovkytitNA/QtBQXL1zGBEA7wyb7J7dXylYSI0V1TUh7NYDm0jgmDfWdijfXZi40BJlroaQZv/bUCMM/WU51Q8XIXFiXW+RNTEtH4DHqgg5yCnhMI5vOtlAaFjFcefZwkrHJFK74dzALW2flpToFpNUS/HB7+o1x5hunQA2ooCdcAUQZAfvSsn6CJTz6duGk2lTqncH50TECNhuVEY9fT2lgkAwjnFvkFbQ0fulyI8Q0EbNZOeePwC3U+fMhK2wIaFaFWH+IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/c0lXViAFV90AXu9ZRlblrxZlKsFqNNOHQD/FJGkfUY=; b=F3njWp3IJwbuLI9GwEgf1nmqT99uzUahe/tjRR8fTjqj4CBzA9C9lJu+O8ALC6NPVEtHMDl7JaAw87xBfMvUYaWrpd7dECN2q2UT0abthTpmcpU3x+3/QYOTp+lwKPddSxfF3ojMEGhmK58aSkZAwQLnjcBGFGp/UUoO2wuZqoYiA7tFClUYIQ1tn3pL8O86UbZ4OuUTL5klx97pplDTwlLrQvgJOHrxWqk3ZW2Q4Ii16DzvmeiVApskEkRvxNKEagnsG64rsA0m4a8+fBgsY2XCHJ77Vkyo/WmMu9enO8x9BgBJG7KyBu9zWfUlm1hOGPklN+CrDvHD1e864REPQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/c0lXViAFV90AXu9ZRlblrxZlKsFqNNOHQD/FJGkfUY=; b=iazh9aqZXFzbo59TXHeZrtWH6/KJMwv5mcFgftOxgOTbiZ8ePJRYlAOpT8jQuk7u0rZlmW8lPtydMx8FBuTU1uTVNp7ETCTGnjvlgG/eeZaTQy+N65Camy0HCtrpxiWnydyp4hZeAoCxTF/8r3XHm53fm8VG/rWf5lEx3PlluHJ9260WvUGZUSI4QQCEQBthSCDdxEBMBwGGm3g2NvJuMYdjhoeC3bfuyRNytSJtG6Ef6HwODP0koBq6waQFeLtARJfkpp29lWhOz0eQVyg2Q7kbSu1KQ3bTdaP7JGcZa2iT4ZYMMWunfEb5Gnlkt7Awp4GOqFlDCzrNPjJZwofqCA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PA4PR01MB9452.eurprd01.prod.exchangelabs.com (2603:10a6:102:2af::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 20:27:01 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 20:27:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Jul 2022 22:26:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [kEgAjtRKhvYIOP2QHz7VIusQf4APfDnt] X-ClientProxiedBy: AS9PR06CA0419.eurprd06.prod.outlook.com (2603:10a6:20b:461::15) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220705202650.797218-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 36156286-7563-4d4f-826b-08da5ec4b774 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEtx48ky6LpRAMOTYXyX1XRTsH2TCP9NV2cH6Ftlhj3ILD9JCt9y1Bd+ZcYlOr48kF12KvYTWjcGiY/ea1KBcsb1n5xqAqQ0Xwz7GJUQ3Mbf2DQIydZ14EnWRrsvVzk8V/3sud1m232ngOZPomKU+JCP6T8A9Mw2/ty5CwfDlotDxu4V2/DxY8aUXmvMM1F/Lhq1AsqTMsRzI3Zq0fCzT+BxSUcIwas26lAM7a0j6zqY0Ffi+zUxjUyxXj3JWwaZcv5XukiwW0ALl8VCRZzh7jMUEVvsUuxDHS7u7M+sGCYrpz0tiWvbXQE6kWLpIBmfHKYy5MubE1QMgt6qQjy/AmOZ6pRwDgqu/UzV3m5fQbuO0SYSh9079WY5K6rQOv/gTfPaD9FO1Gf9t8AhuxqERbiXVTOqRRuuvveEBvy+BFjtbRCmv9SYOJvMwvBFIqt1CmWS8dAhwl2TiifQ0ThO6W21kPDOvfQEMM9oQE0WDrt9Fjmt6D445bzlmfUylUvWzQ8HpBfhxNhC+US3tWjW+fNDNMu1gmOCGm4aLe6wv7pCbFjqiYmychfubmikUleDum4fJmnJPjakAfXzTymKJUpiukShrQUEhc29AKwAlqizrG+s8NVm7WEdRZfWR9sd0jtjV7brOPNzmwL/XMVjFog6ZHuJfudWsZdtJtoYtv4i8iLdjXhf/nya5uQjzpATHkSqV2LfsE/rJcw14eklEbHzf2gHMArcz6vs4RqAftr+RiVkJky1nDnOt3gycAVzzrAiv9MkqiYma6WgBZVIyyxe X-MS-TrafficTypeDiagnostic: PA4PR01MB9452:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z2GLt9yR5LVujoOwYs6Yc6GHWczfuj88ZrhUPR5yORWr/WPvdC218XPTy//NUTVbwMPDiqUwJXm+UTw+Eno51fG+vVNBy207TW9j1tuZYl4VeWYMywJ1wDCSZYU9SaOaqRkxs4gfwdrk7u5FNGoLshqatpZa1B0JoHi+UK/5ikNoNWUJQ96yr0rjMY5MxpWps2awMwABgpHn1HjiwksFNus7FAJ5qvpcuiL2unVlhjOrH2+Fca3UlTwt0gDEnxL4dASt2/ZxOA+XeyLup/xAv5t6QUcPPi2R7l5rTQNgVdEez8RfwdVNYV4yfBUVLlkA6lZDwpJLkKWYsbICzK+56YO4xHHSHRU5NJyn8+Lzxq7+lwpTF9I0uD3dlVpgc/fN9EUcKQyBw0vb2RVEH3AebtfrUQ08L/eNf14JSpOl9mRCjeMzdLbwgMSbvCeRUyo1kCxG44ezLPR8pPHy2ccidfrs8CNxPn9rrQJJ4Za3kFLLl7BfMLk77i3bawI8I0DCyTWfu6EDtey74ikR97U9v8JQasJVZD2d+Eg/vIESr2K/aVMLd7aDB2GLtRxz6x12KJayfV8DNilbIMuMMAtOO5IUQXdIy5RkA4vaF4PccdR86mtlulVwBBBIDn9c6MvIcQe2VqPuETespgtv4ToKoQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sq/tBhEwfNB4ykE2dIJbG4SZRuEjrwb1vFAHfGak20hl47x0eyC5eXytrXcr?= =?us-ascii?Q?2w1a9Fa7lguCznZhVN2F1nClfbe6dUgovuu0MzeZJcgrxRNfOHirCesXllQ4?= =?us-ascii?Q?V57BnW/wSxaZPe9ora9RHYRw9juPTcs+JqgHC09fREk/Tz7rSP4991NHzLN6?= =?us-ascii?Q?tpy1dsMDqHENFvF/m8wfJwH5RvMkEZmZhP72Dr9C3ivZrjauT0IBI7e9HUH/?= =?us-ascii?Q?uElaycaVzxyLztTrH1AU04ySzTan8XgKw6V01DqBs0uYklG9+DBSkxaDusAI?= =?us-ascii?Q?ny5re2kmYrtUzvAUUo3uHmVSIPez+dcWSeSm0/HIjM1rpV5sl2IZCnynlpLw?= =?us-ascii?Q?yat7/b03XpmB5sA+lPnaHB1eRJ4ZfG/s+8WZBgKUIHBoVwGn1tJmNcq8+6I1?= =?us-ascii?Q?e2BkynmzI7aNCQ4x33JyjzCUUKox8T/jyZQ8iYkHUmBggjqVS+fKsFZcH/ke?= =?us-ascii?Q?wt/4ZUwPbOOJAtHNbbMVxfDFflXBK0RU3iIL6yYUQ3eI53HlsnaSUhIeSzrj?= =?us-ascii?Q?LkWjqc1kk91/YZyDRhivC1Kd5NBeXlftFi27IPSRuEmSN1kAiYtEzHh3+UWT?= =?us-ascii?Q?bRkXOD6pB3nTjVHwk3Y+rawcSSIpbOtGjgiASrCGNQ/E2qegzBU4R5mopQ/2?= =?us-ascii?Q?hal/tWYPga8JMQCE9rtLcihiUdTzYUXRd+FwX1ovTkrS6Nl+OPNYNmsM4IvM?= =?us-ascii?Q?LEdEpLx9pJrOf48e1ui9wS07AGBgPrvPA1ar5OqGwrIFM+pY0RkRiNpY6exf?= =?us-ascii?Q?6wkEB+nxppldDgwWdrDXX4yLDf1jkg6ikYgC0Y5RYD01tyzZ462Kq+AOE+NT?= =?us-ascii?Q?Ka9+rI9dRWMQZiQjueXf448SV3pp+X/akOduJWFSipX0ck6vNw1kdIQwAKMY?= =?us-ascii?Q?9MzP+Exm5dlVmBi0s//Xy97NIgxxaQRlM4TafXf7JdTDC3weT15Jap1mG8n1?= =?us-ascii?Q?n1xmTUZmaE5YIAU1h+q9jkz41HjjAeeFUjvqMv+llPxq4EtLxHAi1UlW1Czf?= =?us-ascii?Q?KQ+gkOj+vK07Sys6FYulMc7lTpBij3Qy+mNPjr1f612utkl1etx+/PSZtBLu?= =?us-ascii?Q?1GhO+09yvwwHIjBIH5wMlc3ySmU9XyyedcLsovoifW0lQ/wf+1v7gaX7PL+1?= =?us-ascii?Q?UB5RcSjQGvW69uAHIV5JkYYknZOuzYNSTBsL+Xb3aBIzXY5u2g3juvTSzlAc?= =?us-ascii?Q?PElkpAJNy65kjI+D6H75yl/FjcOBhk115LxaBZcmyAmUxeA/WrakWnRnHJqN?= =?us-ascii?Q?M95W/QHxuyxco/Q6Z8UUpryagrhc4sNY/DhiORpq5RyMzXeLkIyvoNF2bWGH?= =?us-ascii?Q?Ej8=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36156286-7563-4d4f-826b-08da5ec4b774 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 20:27:01.3727 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR01MB9452 Subject: [FFmpeg-devel] [PATCH 2/8] avformat/flvenc: Add deinit function X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes memleaks when the trailer is never written or when shift_data() fails when writing the trailer. Signed-off-by: Andreas Rheinhardt --- This is the same as https://patchwork.ffmpeg.org/project/ffmpeg/patch/20191023125944.10292-4-andreas.rheinhardt@gmail.com/ libavformat/flvenc.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 4e65ba4066..b6135b25bf 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -733,7 +733,7 @@ static int flv_write_trailer(AVFormatContext *s) int64_t cur_pos = avio_tell(s->pb); if (build_keyframes_idx) { - FLVFileposition *newflv_posinfo, *p; + FLVFileposition *newflv_posinfo; avio_seek(pb, flv->videosize_offset, SEEK_SET); put_amf_double(pb, flv->videosize); @@ -768,19 +768,6 @@ static int flv_write_trailer(AVFormatContext *s) put_amf_double(pb, newflv_posinfo->keyframe_timestamp); } - newflv_posinfo = flv->head_filepositions; - while (newflv_posinfo) { - p = newflv_posinfo->next; - if (p) { - newflv_posinfo->next = p->next; - av_free(p); - p = NULL; - } else { - av_free(newflv_posinfo); - newflv_posinfo = NULL; - } - } - put_amf_string(pb, ""); avio_w8(pb, AMF_END_OF_OBJECT); @@ -1047,6 +1034,20 @@ static int flv_check_bitstream(AVFormatContext *s, AVStream *st, return ret; } +static void flv_deinit(AVFormatContext *s) +{ + FLVContext *flv = s->priv_data; + FLVFileposition *filepos = flv->head_filepositions; + + while (filepos) { + FLVFileposition *next = filepos->next; + av_free(filepos); + filepos = next; + } + flv->filepositions = flv->head_filepositions = NULL; + flv->filepositions_count = 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" }, @@ -1076,6 +1077,7 @@ const 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 -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".