From patchwork Thu Aug 25 20:57:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37493 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp569843pzh; Thu, 25 Aug 2022 13:58:14 -0700 (PDT) X-Google-Smtp-Source: AA6agR5HFSok/vv0wFYk64A64B14+fKMFckkxztFEl7JyMVsGz/fwRKDdrAT6LdjFzbIJ5R3hzGJ X-Received: by 2002:aa7:d7c1:0:b0:447:d3ec:69cb with SMTP id e1-20020aa7d7c1000000b00447d3ec69cbmr1391021eds.105.1661461093975; Thu, 25 Aug 2022 13:58:13 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n22-20020a5099d6000000b0043d37773dbasi352290edb.90.2022.08.25.13.58.13; Thu, 25 Aug 2022 13:58:13 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="ARYJGf/g"; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 716E868B992; Thu, 25 Aug 2022 23:58:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069093.outbound.protection.outlook.com [40.92.69.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EA7068B8EC for ; Thu, 25 Aug 2022 23:58:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kh4YC2UieGIppWBej3HGaGLxFmMGsubOkr6QtE/bOzWXgHk8sEnVp74Je7Da4pFpF0LOblTlP/aE5BpQ1df6/rgm7B2Ce5WE+pOsc4ZAXokjYbTnJ2GRiiARFwQG8/BdKgCrQJMUz9zDopsn5gersmbLIVMQXwKkQqS4d2oGH1q5B11w9YfzDVzacNwdq/O0XQ1if8juOmGtgHnqqQtmnxIOt4BPMzmYiyFggQV/cV3Zaw93omG9NI0bRbsf3BjMhqnY+2VD7jcz+L9gkblPLWdUCleHCwNIJbknL2ufltiNs1ENwihZ+0hWOcvTVptPqGoBodqX3i0cImVTF1whYw== 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=hQjVHeHkcENk3cVj0H91Ak3Cxhn7L/ftti/asrWqXSQ=; b=NztxvMvDVORM9lxDmWAXcJgJI4TQ5lLwuPViB9I3aBmBq/gx4wiXiBh+lCvlQdQLqRq3KWqUG1uJde3btkVlit/k4gQ82TxyW2io5kSrDsHfK97PxzCWBZ87s58bYeDST8UJ2wIEePgYCHbZmDtn6TefrQEqEtNwepX8oPHd8AVwXxdAdBEBqeCv2A+tQ3hQ2NPR1O1wL5YQfb3mKV0qcThsxVIGHzVNBo76gYOHJ5YzLjMKCeTSytB7I/16CJT78qhDnBj9ooRyVE9esdozSvfms9q0Xd+57BYZataBci9XvzZiPQHoi4zdbbMAsY6T18GmNetcsFzu5ToqL9BgoQ== 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=hQjVHeHkcENk3cVj0H91Ak3Cxhn7L/ftti/asrWqXSQ=; b=ARYJGf/gxafFmlDymrSCeYLUa9AT7J9VmHzJuutlkw9JpKHoxhRKkruephZN/XAzlH5vNTrGXowIroYk0Rxg1A2B5UDFlywIW3ickaH0ppQrLVsGF1NU9Sna0f/iFshfoQf4urvcZ0rvSe3EwI69W2G80D8W1kyLkSYg4H1hRh42vZ7tYcoToyq1d0tXOUWNFNf/+Btey0GWG2wO3bYJFOpbmQvWnghH9nmUS4yId49bXavdPdblXLDBVghM66l9AbY2ojvXgqs56kuZKkaD3aHcbhqLEcCdHlzqMIBTAqcyPE9iUzL8a5ekP0jrRNA1IXmPUC6PS/FCxoEqTwaubg== Received: from HE1PR0101MB2219.eurprd01.prod.exchangelabs.com (2603:10a6:3:2b::25) by AM0PR0102MB3652.eurprd01.prod.exchangelabs.com (2603:10a6:208:3::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.21; Thu, 25 Aug 2022 20:58:01 +0000 Received: from HE1PR0101MB2219.eurprd01.prod.exchangelabs.com ([fe80::a552:4834:4a95:2c5e]) by HE1PR0101MB2219.eurprd01.prod.exchangelabs.com ([fe80::a552:4834:4a95:2c5e%6]) with mapi id 15.20.5546.024; Thu, 25 Aug 2022 20:58:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Aug 2022 22:57:54 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [3LGLxgJjwVB7LBISPafrq98lvf1txrUl] X-ClientProxiedBy: ZR0P278CA0029.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::16) To HE1PR0101MB2219.eurprd01.prod.exchangelabs.com (2603:10a6:3:2b::25) X-Microsoft-Original-Message-ID: <20220825205754.671321-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cd507806-c4b4-4cc5-297f-08da86dc7f2c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS9msLST/hR/KAN/HlVpM25oF16m6XjSPCFPZuEEM6P1Jz4E2vP2YZIZCEDb1SLKFXx4LXqxjXobK3eKcq0szwiQSqHaMGPCVHHaJL/G4XicCaDJAw4kfi+1mqDaWXlK3N+9hjUGQH2SvoHVxzu0YLz2zHOpzm/kSueAMy5+ok14/2mt+C1GPfFIpQgMchlpYroFfSzW20qGMqvfeO9tthW41aIok81U0vPx39ZMwbCgBQJaVGHPRzECUK3cMCyV5W8kybSacy5dzzLpjyocA+lRUYMnEjDe6SgquKMyM5CS0qojLGYRi8V+vRKzwrAzdePXX6Ka/GvSlO5ZRY/TK2wK5QBy7kmchKOVKb1AB1AtcAGYVjnoDwJ3QlYRCQKCF21ETZ4Sq2jYvwyCuMrdlbnfC/6C2q1ehdh7a22BXLyWX+7UnKaSP9T+E7x3gYM6h1gVOFoYXfKSpjh9PlbDkDBez6lkUYUrsqzpUczCjjozt1uprIZ1zkXp+sAwgPJBA5yTMuEUaOTdUYw8pzK64rbyBmDIBMldus0COu7wpmoMOmcWkX9zenkz9RnuweT2VtOAISnH33JSGjV5LJPbFwdTej1JgFaqEsQ3J57nrWo0U2l5OvqMyqivEpVCqZmJ3LsH/KBHZuKw/4/E+XIN5rEOPrkrO7Cxh/EylFAsMmVgAC2+3+6Y259OLUj483EitJ9RN95P764mped/cCNeiCejQdBW2Tgp3MK6cRDjk7sJsslbyeQ9cnWS8cWDKjUaMU= X-MS-TrafficTypeDiagnostic: AM0PR0102MB3652:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wdwLQVOuDlBEq4CPd54zuZny9nMAFNfTrKraROWQaGiIxG3zyWFKSxgYAnJq5TJlk+Q0i2hFPmbhHjYndTl6FFjZsePuXOwUNugARr8eq+lrjQjjb0HWcoRh8znDAUejJVaXTkrZsDsC205Vse7wiwNEqqva/+IAggJsDddzGVbOYKmxg5ZSEyoRnlAViu3ppjWd6gdnYaU+rK0FHHLoXdiywZ9zl1b7XbRKNErxCG6mLI/8ClYCd/11RaezEKHCByyQEeVFYS38WXabHRZ9qQ/mo/jch0R6PRbFtJE95Tip1emjH38uVskITVHiBcPp6ZVDSnNkCLLprSKPrwnGWOG1VKTdIsp9AZpO7sDo85hTbe7iV1bLjEYccbAV2BklnUwehdQmOlD97OstrxJ9RcIoBSAsy5S+MJMbc0qVHR7/ePHUiYuHu5YIqFx8i4A33hyZSgUS6NB0g1Ddlf+6gmbJd/P1vRkREgBHIP4xIQzIN7+Ied3lC2afg4qH4w/iHUkyM8oSabBxrk8YVd0yCCXZfAPHnTfyJ39NjRQY7R747sgz8BIPNW+1DJ+FjvMYWsT/7+rZMMof1NLKVIJuiqMCGw6QOZGNQglaOI6zI090ynA6SfHtGzJgTxLpp05XOUSOA/zdPdM4CVvSSpTmjA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uyiw83+NjJmhNVGLQVQo1+Aug0xXqlHCL8hwrJmz9h7mLUFXduAJTCQ0seTzcU/bMbjG/FPnEWFsWLXbkHTCTkSSYtoZPSTu+dgE06e5VGm+JLE2hYTjF0PKyxOoLVO9dnHuABTVik7GxporsWQLZfDcWgC9obkMU4ZSUYdhgD0ZX3GKvglCzw8rl3b0JeWMN0VLXasXE+OKv88OUyA+djM08daytWUULbm64xaEPKNCvPlQX3X+FPOYhXkyWxxkIBvQXc9dm2xO43tTP5ZjAqsTEIQqOe7OWjC70sZJKoZFzIXzI3F4KTN+iZhT2dLwyYwyPVoKx/e0V9uJSVhAqKcNPey+qAi+g17Jqo4zkf7y8PiGl5oftlW1oBAzjdl3WXX6cK9mKt2TA4EOGLPs2XfLbA9m6bjIm1EHd6Exym1kwYgZd+qZ8gNFuqK0GMC3vq6MG9lAB5+fb9q6srDE66acjH8pN++T1KH7GFOd+EXSVII/tJo9YLLHueNjqy6OhahUdnIcgmgg+DCSgmHQ3qHNlKZzsSSE+Hxu3wT7aCGdoS+pehs90Oeoy2TqHx6/nDqV+OrCtPSl8OhnPPuMFrP0ukZDraH1D10YFIwd+Uh767pMk5NJT2YBsbIs7rHhACFxcggbWLkHX453u/c1W+8VckVJ1Mm6K1COrq1CheOb/dvaDNN871rhuNrd2U/DAPpyAkeX1dHRoKQC9QBFC0C+WjRyS6S+cSUAXPuIEZexLdTVL9jJNmc1PazRRe5I+iirVZlzfoxChcPDcGJ9ItfvMGZtbC5H2JPeul9N037r4o8YYUnAMRIxDpvIiM0J94W6evKOIXJQdT1alNJxL+8KqKoeibnmna60gHzXFd89wew1OWTxPHdJshrXU8m4OBHqlqs4rGDqlhTFOPeLgACgIrWM7KHcKgfe8TWc+h9nL70depnJkdUXnvNjhhoQCZ+XH/voz9akNha3I/RXGWRZtrpotP52jSVon2Mj0918H7Nhe7zaMl09K9vxKXNqZzTitDPY3gwICcrtjPtjcFbN3lruebGnvdRb6pv6kbORVPy4Kdxv622Bh2J3+ZM+LFv2PSRYSSfCaW+8Lg6CsmfL10X1RiFLVilB5ibf4PNHAr82844tEWzQ7VbyJaKJ8djtjNxwbz7xUjLndC4CblY50IhN0iIBs5rI/fgSSmTbOvRVHzhyzgFhlxlXVYpQWN+q2UtZYeGiZ2ghj3YXydMM0ZzhN9SqyaP5LWf8Ta2iaFWxE0Vz250tDGnBvMngcEXoga212u0ig4xy3xLl9foA+OhMMk5uK2v93+n9WHw= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd507806-c4b4-4cc5-297f-08da86dc7f2c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0101MB2219.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2022 20:58:01.7280 (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: AM0PR0102MB3652 Subject: [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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: U1JqSj32lOc8 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"); printf("#### End failing test ####\n"); return ret;