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 2599D44100 for ; Fri, 26 Aug 2022 08:22:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2029E68BA1C; Fri, 26 Aug 2022 11:22:31 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2043.outbound.protection.outlook.com [40.92.89.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8824268B72B for ; Fri, 26 Aug 2022 11:22:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=brgznFzjwNjKPGvRlRrUu1ZTkcdDikWHEOpwfCuZJXyOow5nQyw7xVXS/al8lKcHRSkRcrN/YfOJspm1zMWbPZXA8RYwyuiziJE63MTz4Skax2k2B7QHJ/lbqRX/FqhuR4hJse+wk0HW3aWDdc6fVtBmZYrkZw/wo/ozYG92ZdRRcnd2UA/pzRtiLsa1+cucnQciGJEadQl4M62r4d3TCKsNF24GhDtDHWCTB7tcX5rwiqrGTnd/8BzBnFHYsFXyAhHGQx3DU2+TBZjqhXTk9Ysi8fDxQt/uTdL5WA8WDcRL9ftVtHcVMAQQZE1WJGLMX5kbAa3dhscG7lRt0KAGHg== 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=fiHmwrLSqcAAFkCMG462QMqK0HQHK2pBO0N7gTyWuzU=; b=PFq6Q3eL4b1WhPENpMrrE8RjQn/SC2/aZIZGnHsvtywQZwnsL2V43z+9wMsUa3q+UASJ15spEAVHoweu5A7S8yumKZ8+qmXgGHPAkl5YtnLH0QhGB85a58P5fSlxGTBptqTX1ebOXcnotrQaBCpAMFeho8sODqytwwFcXXBb5bxTCLokQ5TaVoVYBxgxCR/GY8udILfZT/76G7jZj8Nr+lPZpEw7sTA5z1G8cYvRkCVPPJyshaLaCyXCMg0/Von3eZxXT4+hdMoTD0BBLjmyNNAshT2GAIkPMqz31jJfa78OztsfgTWzBN9UIwY90356eFBbsaT96mCdvQOJpHSkSA== 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=fiHmwrLSqcAAFkCMG462QMqK0HQHK2pBO0N7gTyWuzU=; b=UXvhVDykX290ty9kbNHUWcQ4eiFF/PO8A+Je5KZGveVFmzoUNOORuqIoaqEh0u6gswcxoK8CHPjPO6nDjDW38dmNvsvzZ4n3jKnzC1Ui61rwg037ZE5GPgVwLG+CmknuP5JwVeV0Z5tD0FRHT3MyAWZcrUX2xlIeG2bo3abgXJfqch2UvwABbjFgw0RXp/l9QMlYtlWiS6hjaYvVD3famLvRrUOWYx2Q28/SPjQV0QERoZ/VwkmVrye2qQr9qz2YR9L7xd0vEOYMqZIqBCj6aDUMaSCfB7IWrVsTpCQsNNygpBx3FBR5DXMvg97dCELKxGoZ3yk7x3/ZCf7Gs9I4aA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PR3PR01MB7161.eurprd01.prod.exchangelabs.com (2603:10a6:102:78::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Fri, 26 Aug 2022 08:22:22 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5546.026; Fri, 26 Aug 2022 08:22:22 +0000 Message-ID: Date: Fri, 26 Aug 2022 10:22:21 +0200 Content-Language: en-US To: Pierre-Anthony Lemieux , FFmpeg development discussions and patches References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [xenmjThn5bJptFWQg7n4B5oyUnKtnl4n] X-ClientProxiedBy: AS8PR04CA0180.eurprd04.prod.outlook.com (2603:10a6:20b:331::35) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <023b32b7-7385-470b-c5e9-68d326eb2403@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c30213d1-5103-412d-d53c-08da873c190e X-MS-TrafficTypeDiagnostic: PR3PR01MB7161:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uNPdTb1rhSBo+qabFgJXHc/o6AIPa0IxoYAPMFTAr1TTyjYgbv264Lc9rfI1p1vHbIErKwnpEiCdMK0+KPuSbFoPpScA8o3XiUg6POOIn+eGrkUmGPMSSAwacgwenAT8yCP4kB4vyt7mDN/EZon566mQQAkCkVVDwGWH5XzJMRr33StxWqDC9L3UObgO62yvDD4mWzall/K4Yg1rQrKHQio0XQhrZdBcPer3IVSrNukpUE7Im9lEEELxzKQOF5CBaiIkDtD6ZlAw9tguVF7s401PRwCqiJb3bsAhYse4gNX6WxusTdfh4eVSwgauV9JpKmghszec18SLLvpjGl6bzkAQMGf8oOQH58Nt8+WHMr4l2Q3h39gM+4NAeJWf/nQC0IF8kiFUMgwxCNiI3V+LHWR+aBWOjV8AwEulnwSQYpxoYmVcyx9E53+4YH5txgC7SdUlo47JnjbB+318X7ZcpwUfRgPKbbv45TJ1pKx0kYUaiJltcsPAC3FYsFUOV3Dqte7PCGHu/rHDGB0EqZpLcLk/J7JD29OUiqwdyOZVfXbEThiCm7ckbGfRAFj0MV2zYOsR4EgoazflbViLBXkBtah45mtGPEUH+8aQuGoRcxkKjT9u2UbT/E4GtOqGSc6UxUMm6C1SanJISAZYT8HxaHVPRDoPvFf4pzxQ65eM06/lu52U/Rf96YjavM0wKjvF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TU1pa25NbXB5QlZ5YUMwdVUxUWZLb1NMOTJmUjlhUFhyRzJnYkR1K2JaSUxW?= =?utf-8?B?OUR0empLU2lVUHg3VEtIUnFJODlwdittWnJ5ZDQ5REZwS3hobmpGOFRVTDdH?= =?utf-8?B?eCtyM3lIYnBkdGF6TzZNSHJ5SElFeWxQaFhqem9RQnEvK25YUzJRQTR1Y1VM?= =?utf-8?B?UUdnUzZHZHhEN0VhSmtLQ0RaVlBHbit3cnd2Ym1KYTBnYTJWVTVVdGx0dmRm?= =?utf-8?B?bjZGWDY3a0ovYU9MSkV3NXJEcHpFS2RiQ1Z2dFJsVkNmV2RMaEg1YktFbWkv?= =?utf-8?B?a0VmeFAxeFlvSDVrVUVTa1ZZYmRYSWhUeVlzK0NqVi9UY1lOZFlpWURlWkdV?= =?utf-8?B?RHd3RWw3M1p6ZVJ0dmg5aHhVbVFITkx6WUVoMDRiU2tEamZzRkQ4N0Z2ZHZh?= =?utf-8?B?V2FKbW5heXQ4a2ptUkQ0cU1PZm5oYndSem9RVWcrZ2s0MUxVbmY2TVcvS0lT?= =?utf-8?B?dnNXd2U1V2dvOUhpbFB2OWNaVnlDdTl2K0RSd0YybzNzdEU4dHcyTjZqb1hK?= =?utf-8?B?OXl4bEFzNURpQUtvNTNTUm92blNFY1dkcERyRzBsdFY0VmNNak5tV3FIMDZ1?= =?utf-8?B?ZlhrRXJlVmx1V2ROTnlubzh4ZXhldzhnZGhlUDFVZkprSGlPUVZqZ1RQcUkx?= =?utf-8?B?MHpJdTd0alYvUGQvY1BqdEttT1YwYUdOVlZSMGp2NWdrZ29VYXVwQTFtUWVm?= =?utf-8?B?K3cveUQ3ajVYRVNIYU1XdFNGYTlZTDNVWW0xVGpRQUE2anZKZ21mYU5TMFQr?= =?utf-8?B?WGk4bVB4VWZTMmprRTdPbFZKOWdTYmVCSFlLbS9JVEZtRE93TkNwU2pQL0k1?= =?utf-8?B?N2Jya1h2ejRaWDlWNllxaTBJQnIxcUgyM0tKQVE5NHh6TEh4V01CZlpKTHla?= =?utf-8?B?SlhIWko0R2d1MGVJbjFWeEl6Z1BYREd6d2RJMzNkTURKcGRzRzZYS0J6bHdM?= =?utf-8?B?eWNwMy8zbU1IVDdZclFvSjdLNmdxYWxuSUlPMXlEVzhCc2pnaDF4dlFuVkd1?= =?utf-8?B?WVNZVDJqSTgvcVJzUURCYXRLNDJaakJNcVRQSzgrL2xwdGJtWkRpbFRNZ3dv?= =?utf-8?B?V1kxTkl1RTJCbXArdi9IbFBwN3RyZ3Q4VE1JOWVDK2MrZlNKU3pxZlZ1WHdz?= =?utf-8?B?d1hPMVkrV1JOanRhajk5WlQrMFBVdWEzcWZTV3ROOWRQcm1GaDRqTkc3SGx1?= =?utf-8?B?K0t5Si9nOUlhUUNQSkhtWFM4WEFCcXNkcDM3eU1uUkQzbCtNRFhtMCs1UTVR?= =?utf-8?B?ZWQyZHYycGE2OG1SdUQwQjhoUXdJT3RqdjVHQVN0RGFuUVVZM1NPWFJ4NjRW?= =?utf-8?B?cm1tQW1ubHM2cW1VQkVSUmxjZGtDYnFMamxMT3hOdGRkTU9TcnVBSU9nTStw?= =?utf-8?B?TDA3R3FNejlPWVVOenJwc2JEWURFdzFSSmI3dGU3THBrTFJEa3JCa2pHLzE2?= =?utf-8?B?cHpTM3I3eGJXYzBjZXdZdmtCMnJZVW0xaE5UakZPVUJaYnRCUEROQjZCeTFS?= =?utf-8?B?MW1DcVUxcUNWN2Fld0pOOGk0ZDNTTlFhV0FtMEl0MFNjdlFxL1JEOXNQckR6?= =?utf-8?B?SitYd3JuZlpCS2owd3RGa0svZ01nVnJqVU1VWUlVeFZTQWRTRHU4ODVpRWNq?= =?utf-8?B?SmFKc2J5QXRUUU5ZNzN4QVRTcHZmRE8yM2VQNDhhZGU5Ymt0SlpIUzZSTW1Y?= =?utf-8?B?QXlkM1AydkRrMW8wRDlLOTNxR2JRUHBOQWFjSEs2YUdPTEpsMXUwbVFQTG5W?= =?utf-8?Q?clt1zsTPuvExhekMpU=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c30213d1-5103-412d-d53c-08da873c190e X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2022 08:22:21.9379 (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: PR3PR01MB7161 Subject: Re: [FFmpeg-devel] [PATCH] avformat/tests/imf: Test ff_imf_parse_cpl_from_xml_dom cleanup 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: Pierre-Anthony Lemieux: > On Thu, Aug 25, 2022 at 1:58 PM Andreas Rheinhardt > wrote: >> >> Improves the test; also should fix Coverity issue #1512408. >> >> Signed-off-by: Andreas Rheinhardt >> --- >> libavformat/tests/imf.c | 10 ++++++---- >> 1 file changed, 6 insertions(+), 4 deletions(-) >> >> diff --git a/libavformat/tests/imf.c b/libavformat/tests/imf.c >> index e65629ccbc..a7b2ed3b4d 100644 >> --- a/libavformat/tests/imf.c >> +++ b/libavformat/tests/imf.c >> @@ -338,10 +338,9 @@ static int test_cpl_parsing(void) >> return 0; >> } >> >> -static int test_bad_cpl_parsing(void) >> +static int test_bad_cpl_parsing(FFIMFCPL **cpl) >> { >> xmlDocPtr doc; >> - FFIMFCPL *cpl; >> int ret; >> >> doc = xmlReadMemory(cpl_bad_doc, strlen(cpl_bad_doc), NULL, NULL, 0); >> @@ -350,7 +349,7 @@ static int test_bad_cpl_parsing(void) >> return 1; >> } >> >> - ret = ff_imf_parse_cpl_from_xml_dom(doc, &cpl); >> + ret = ff_imf_parse_cpl_from_xml_dom(doc, cpl); >> xmlFreeDoc(doc); >> if (ret) { >> printf("CPL parsing failed.\n"); >> @@ -506,6 +505,7 @@ fail: >> >> int main(int argc, char *argv[]) >> { >> + FFIMFCPL *cpl; >> int ret = 0; >> >> if (test_cpl_parsing() != 0) >> @@ -518,8 +518,10 @@ int main(int argc, char *argv[]) >> ret = 1; >> >> printf("#### The following should fail ####\n"); >> - if (test_bad_cpl_parsing() == 0) >> + if (test_bad_cpl_parsing(&cpl) == 0) >> ret = 1; >> + else if (cpl) >> + printf("Improper cleanup after failed CPL parsing\n"); > > Shouldn't `ret` be set to 1 here as well? > Will do. (When run as part of FATE, the test would nevertheless fail, because the ref file does not contain the "Improper cleanup" line.) >> printf("#### End failing test ####\n"); >> >> return ret; >> -- >> 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".