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 C65034ACA7 for ; Sun, 19 May 2024 09:57:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF4DD68CEDC; Sun, 19 May 2024 12:57:37 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2059.outbound.protection.outlook.com [40.92.90.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 829C168C21A for ; Sun, 19 May 2024 12:57:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LmbkJMxp5aWvqCC/R6iwEn5i3txEmdyJerFCOakLxEnUMEWe+15nnvGyw3zLpa4KNVq/nToq+GBZkmtubB3VPsh9ryOHsVP6gL7oLg25fZlIfdMby3wzMSlZkmgoDub/K+jyk+HEUQ8K6OWho+ZCnC/4z5fmfRtH6Aohzqg2rxZGLOCoswhHBN1Fez8UnTxOAtUaATzoaKIYqo+iK5Ykpc8M72RFGshwRFK7A1/ZlHP4KX6i+u186tV+ywXRxF1aqE1IayrjbcM3Ko5UQAhGwpd7FwQLd4LuGzOASkpirKGcNQ+IQhoZ1emZU5O1SjrI4qv2WVjD46N5qBZD5VSwyw== 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=SRrS0HcYGPSq3JyK3njcWn717dwvvAco1f2jOh3aQFk=; b=keUE6CpkHCwiOseid3tNGz/dx/fxKs47O7Lh7y0LPrdY5ZmTZ9tJh2up3jc86Iy5S2Buwa92jWGN5U46jcMDe3bU/QlVO7klsptWpYRNhrFpC8A7NcSfKfQVRJt3AKJTTq+jErFJn5lHXNWBUw271mqwCwLNp1JD4pPmyCvxC03yBq2SlHIgRYNh1hi4n2hAjd/obpqw6NIcciBFBtuYnTKnVnrByu18tAn7BAmyb1H+/2Tk3bk0prjw37K2yL5dEBuC3nPloVF9RBTnppuSPSLPaAalmlgU6V2V3001/LPp1EwdStZPm8FWef1CPa8KcAa4p/VLfbwcyL4tF3WqKA== 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=SRrS0HcYGPSq3JyK3njcWn717dwvvAco1f2jOh3aQFk=; b=Dqi1AOaK86CaX616WHnqOKx6uqakped7X3PD+ZKGpNil5FrF52QWmpCWgjcMBk3cLE0lKIZDzHojaIhg7xRiPzeFa+abxJ6O5YLP8rviqGXq3CccN54BEhhgC6TklZkO6o4YjNIgPRyFbPHFqeQPxkY1VQTnRpohPntkXuZ4EfLHZGOK3Bx1l42Wfr2mglW0DHN13hjuwkoctqqagtk4l6dwy0jqMXMyeMCZtSO81mp+MVVUKSw30PzFvGroSz+FcMJe97TuU+PSxJ72XzUuO7fYoPm5kkcZXqMi8p1fVlHhTpICzjN06KrAm6DoAh3IvkAtL4Jm8zqMjjxqFnWEkw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0365.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.31; Sun, 19 May 2024 09:57:28 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7544.052; Sun, 19 May 2024 09:57:28 +0000 Message-ID: Date: Sun, 19 May 2024 11:57:27 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [8T4TDDUmWZpAL+YH3G0CQFB/DZAlvQKfkr+Qa1iwDBk=] X-ClientProxiedBy: ZR0P278CA0197.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0365:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b6ced8c-7b9b-4c7a-d4b8-08dc77ea17db X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: 2d+5iIsFmwtL4PZT0V72aFq09RoCVXUAl3WmZRRRK05iGg11jJMl6GuRMaSPFRlY6p/vZZIkRpOPZM1sH2QK5Dt0zzA6ZIshb4CEpiEWDeQAVId3RYHbqQM7neuyogHubsIIl0GIjnemqMPUPN2NpmN37MQmJQDfUk8jFfH6O82ZZF1qu19/pLAPY969ukNkk4Mw4Ri3sDid5joGpee/NKAaAmPl1g+anJz01rGGcN2rF5uxOJmbY+hprQ1oCJ5xD8sLQail7ors1TNZsMQusNQRe27sBB/nGXLyBbTqU5V7TcyrWl1+v/q+wf0WfSHOek+cxTa2ah7AfNI4s8mwlT5A+mgiHv1nIs/V1q/1c1/BRYH6cgAS7SzNlMGUNpvtVw7FMFiAyuHQvFs2oVV4uzSlK+xynOMa3NJ48+FLy7lMsH67gUushnEvltjX/TCDpHMWWkv6C/8p9SO07H1iFYnOdJtCDdMdzGTDGb5LeIMmyHEUNWpsYQzM4Hd/Hys8owOceY4Mdaq4CrytU3v4/LnyjYQDIoAUlb7vaznulqXdsGkNAWNZsjS2bZ3BK5T/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TUh1Qk5jMW5Nb3lqNUYvbTVDTlE0K1ltNmJXV0YrNnJYY3hpUnQyRDUvQTNl?= =?utf-8?B?N29NVWpuUHQrNU1mSWhjdmxhL0dRY2s1MzRYRE41MDJJUks1UnlRWmNlTXRH?= =?utf-8?B?WWMrYW1xb2U2MHNLWmNPZzJWYnlMOW1VVVdybTB2UWlZeVVZMU9nQnZEWm5x?= =?utf-8?B?UEx4OUtzc2l6UTBFUTlZMHAxN2VYUFFkRzVYbmpkcTRvaHMyZ2J6ZHU0UDA0?= =?utf-8?B?S2JEeWZkR1owbHlDMjkvTHcwSXNHbnA1Q2p2UmxVS096b0VmY0RoT0JnMHZ4?= =?utf-8?B?TEdVdjlrRFF0NlIvZmtocEk2bm5YNjZ5VFI4elh3NDhxNXlldTRBa2xJMlcx?= =?utf-8?B?V2lDb1BJMnNPcnRFTkhTbkxJMld5WDQvQTlldVg2M3lEbFFoVlJqaDZhckdB?= =?utf-8?B?ZVFzOHVlOXE4QnVSNHJyRHN3Vms0cWdKd1JyNkZPNmVFL1ZEN0hhenNoZno5?= =?utf-8?B?ZTQweHVmODNmRzhtbjg0UGN5eEpyckpoR25PMkRFZzlLaW53VmV2ZFg0Wmxt?= =?utf-8?B?YTZBYkxUcjhVUVI0SHlpaS9yWnpxN2lXWlF6U3paMDhMSTY1ZGFFWDBwbnVX?= =?utf-8?B?aE1YZDNPK2VKOXBRVlkycmxXdG1pMC9HNUN1a055Rk1MT3NWM3dVR09BR3VU?= =?utf-8?B?NmxHekJOc1RGRm4zNzJYU1ZlbnhBWm5ucC8zakMvSHE2NHhwMU5PS1Zkcml2?= =?utf-8?B?ZVVWSHVYV3c5d1c4TTZ2MkdEVkZ5QWhFc3EvTEtuYnAzTnA0aHYvYWxrKzYv?= =?utf-8?B?MWo0Y0U1Q1BNRHRzdlR5QUdLaXZIOTVnOEJuSGNWVEdaUTJ2QlNCeVhiemVw?= =?utf-8?B?SkxpbCtwZmJmTUtBMVl4MTJtNmpLMVprMU1FYXp2Z2hFQ3NER1ZMWUdIWUdX?= =?utf-8?B?cG9QaW9kQWtiQ2RKSEI0YW00Y2RHYnltVWxmdmY2TUoxMjhQbXRDcmg3Sisr?= =?utf-8?B?MmkwRmcyUmx2ODE3d1hLSTRrS3hGTGpuUkp0T1ZleGtOQ0I1Z0NKWnFNQzZL?= =?utf-8?B?ZnJ5NG45MkxrbUowV0xiUGVzeGE5M3YyVGZqUjJTNk5VdjdSQkwwVGdFd0dN?= =?utf-8?B?UkdnczdKSmI2MUU3b1JRemp4UVdLcDFBMGtZVmtnSlNqd0JSbGRteFVua2V3?= =?utf-8?B?MjVRSXRxWURucnZKUEc4UExjeXAxOGpiL2ZqSkhlbUpuQ2gxTWlnMnZCajkw?= =?utf-8?B?MjVqck1YVm5YNHVPbmtvaDF0NEdxK0FrS3Y2N0JSNTZyYjliS2ZlQ2M2dHFG?= =?utf-8?B?UXpFQ2M2SUhSb2IyM0R5N0xuRUxVM1l4QTZZL29xM1ZBRzJjTEU4WmpKYTV0?= =?utf-8?B?WG9pc3VnMlZteXlsc3NLK0xWMGxzb1MxRUk3SXRmcit6OEZaODlhNDB3dll1?= =?utf-8?B?UjJCdTMrSmZNQmNtUzhTZ2hJa1pUekF1S1BPV2VXNS9NNE5PUTFTbVA4WFh2?= =?utf-8?B?NVYrNENlYmc4NTlFTlYzNlpMVG5JZ2hySmo3TW5vTXN2aUpWYmFBM1phcXZu?= =?utf-8?B?QThtMW96SWQ3QkMwZ2lLbnBtSXFIMlJzMTkxMEdTNkxwN0VFdmFzZFgzVXFC?= =?utf-8?B?RGNzTEFHcEF1REFKK09FSE53aGhUT3ZsZk9jdktWZ2lMdXRwbzBsWm1DeXJW?= =?utf-8?B?ZDBORE5OZU9zR2tGN1JXTkUyeXZxenpOdjNHRzJ4VmNGK2lvT3l0em51bzJ6?= =?utf-8?B?a3k3cmVTa2pFT2tjYzNxblp0a0swdHpFblh6L0lzei9KSmlxZGVYcEdnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b6ced8c-7b9b-4c7a-d4b8-08dc77ea17db X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2024 09:57:28.7502 (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: DU2P250MB0365 Subject: Re: [FFmpeg-devel] [PATCH] avformat/flacdec: Reorder allocations to avoid leak on error 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 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: Andreas Rheinhardt: > Fixes Coverity issue #1591795. > > Signed-off-by: Andreas Rheinhardt > --- > libavformat/flacdec.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c > index 3d35da5fea..3c317acaee 100644 > --- a/libavformat/flacdec.c > +++ b/libavformat/flacdec.c > @@ -283,12 +283,6 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde > if (avio_seek(s->pb, *ppos, SEEK_SET) < 0) > return AV_NOPTS_VALUE; > > - parser = av_parser_init(st->codecpar->codec_id); > - if (!parser){ > - return AV_NOPTS_VALUE; > - } > - parser->flags |= PARSER_FLAG_USE_CODEC_TS; > - > if (!flac->parser_dec) { > flac->parser_dec = avcodec_alloc_context3(NULL); > if (!flac->parser_dec) > @@ -299,6 +293,11 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde > return ret; > } > > + parser = av_parser_init(st->codecpar->codec_id); > + if (!parser) > + return AV_NOPTS_VALUE; > + parser->flags |= PARSER_FLAG_USE_CODEC_TS; > + > for (;;){ > uint8_t *data; > int size; Will apply this patch tomorrow unless there are objections. - Andreas _______________________________________________ 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".