From patchwork Wed Nov 9 16:37:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39243 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp414865pzb; Wed, 9 Nov 2022 08:37:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf7kUgm516cg7WbA85PqytsATeTDED+qA2R94cpuhcWyxe+wOfIJc/vkio3mBYWhQ70x3Ap8 X-Received: by 2002:a17:906:50d:b0:7ae:70f9:114 with SMTP id j13-20020a170906050d00b007ae70f90114mr689084eja.44.1668011868966; Wed, 09 Nov 2022 08:37:48 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m21-20020a50ef15000000b00456dcf56d90si13707727eds.84.2022.11.09.08.37.48; Wed, 09 Nov 2022 08:37:48 -0800 (PST) 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="MxPMd8/W"; 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 47E8F68BB2B; Wed, 9 Nov 2022 18:37:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2077.outbound.protection.outlook.com [40.92.49.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 459DF68BAEC for ; Wed, 9 Nov 2022 18:37:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m8eM1z1Ouba6OpDn5weEO3X9AZioYKoTsd+eOJnnJBGNtMtZ94eAvnOtQLa1MpH0voHBwz79bSpfPsNk4zFyGpfmGzLssnT/7W2VguGC4iKU3/gh4istO1jc4IknmAfmV3VQMgVFr/wiujNkIXMqYR5OWxqzdijS23wX8cDQrEunFHlrVhKg/13jMuCJVklvwu+VlXQnuWEfeJP0C8/RJRQEO84HEhAann4C4nuzUa1AcSM8vrZ1UnItW466G3zXeZ6DMj7vohl8LVobpP6///mnrUlBRDtBdztNMZH9soRWZHvr4QHbLHuuvGmaMkTl4ZjQh2qzh8jBE4zu+CgtWA== 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=MVzkcNlOBIzcXbwrRZz4yhYfnaNUPGze7A7lB49dYFk=; b=DhY2Ooz8k8ftVzAq6hL5mgtZ3c7Pv3ZgHcKSH7x8l99PZ5ALfFue51/aKYG3EblCD02bhOxpaRObkOW+1FWg1QmKL1KE9UYg37gIeSPCTZ7DIEqakyMW2GjsxCudhuPBjLVsJXInz6Bxu2+sMqQx9ikrwamfj4X1p5SLx0QOt71lmLFdZTrioCS+s0RgjEUvoyk5q/Y4CMcfk2XuTXgCthnJwxFBJEzgR8+KlHvOvP2ag3My4+JZdM7f2iuzNk5cLeLoY6VxYLCnQaX5O27a87WtLUTZeCuLGmWSjejHLIrJIkU9mLYXqiL8Le7CY5C72oQ5T55Z3ArcYzNHgF361w== 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=MVzkcNlOBIzcXbwrRZz4yhYfnaNUPGze7A7lB49dYFk=; b=MxPMd8/WQLn0aPJFlzv1pS6aS6gwynZQaJ7eKxKIzzSyHaSdzSJV8HIlSIOPPUTHQzfm3tUWFRcypjNgbjGt+eaY3+rOkx/iwwSEEQMrQsSPa/KQuR41c7AEFuyQQksHVWd/iXdVV+sT3FA292C/PzDx8rp4rp6l6mpaILx9l8RsscyK9v38ijHnzcHCqtWNyWPQpTaD/6oT+21jQlCS227bRMyt30hjnvpIhHpkKA5xcKIeeKVQZXz+hbOECnhcjs37oGmadiZjM65tAUbZM+xyB1tfrBd7z7lj2FI37EU6LwLlp3ggczRxQ8eu9xnVqQbiq2oOv/ur3o0aj3WEmA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0141.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:239::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Wed, 9 Nov 2022 16:37:24 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::9587:72b8:e3ec:c4fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::9587:72b8:e3ec:c4fe%6]) with mapi id 15.20.5791.027; Wed, 9 Nov 2022 16:37:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Nov 2022 17:37:30 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [cVkubspSUhVm3ZgPfo6Neo/WkHMc5Ay/eOUUSzXvlcM=] X-ClientProxiedBy: AM6P194CA0050.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:84::27) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221109163730.344988-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0141:EE_ X-MS-Office365-Filtering-Correlation-Id: 97c4c3d4-d525-4b15-fc62-08dac270ae42 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqNWn9S1x2PUOFdlA6Fd+ZoGyeHM1t/M0+xJ/XEPAS0rdXF5r/tQw1+uRlzodxyx92OiFSr4PrT9G9LGfI8pqDerE55DfGiwE7qgq1DsMUTEbEeO80bTzvL101whujlBm/RZrFihxWYzaFrN0EPRnu6D23fRW+WHcJsEuuOQ5fMw1yN0CaZ8Dzzqo3s0IGu4xOfUCkSL61X97Shxf97u82HAA9rFBFivHECHc20RSGqzBoGWM0BzmGeidvyyeeZGj16kPhP/bSOcEuLKkMzEcarpvEJzgxmyADZWcWzAQjYgDx24QFzOjghPPvXSpnmfH976YN87I6ul9EbaivPQ5yCOUDLA7WbEY5OU4xgBT6q1yPeZgvvB4UAFr85d14GrSGej2kzGBard0CGjd5VtG8q1QoiWs3vOzD2+QeFdeGN7bq06qyJpcO3/i8+ll08W/nfK14ngZ6/Rofc4phnC8pIKNDjVaPr/MXrDb/FkfATRJ2EmJKRNV0yE6KxwXY+yrVBW4dePALMwNNBOe1R1w9vJricH8di1MFDIs4h2X58g+eGZHIRUI831PH5dNYhl+2NiTjY0ZCYuPCXSBNbbZHsAu8TUFHIQAd7LNl5RV2CoceB3ZqBhVEyfKqHQCRlsRe1/6sPEl/Gha/6bcdCjS+b16d628UE9OTR3V2PagX98O7iRYCq41TNdxP5Hw4cxJM0Cqbv3WZ2K6le2BZHEwDzIGW+vkKt/7k7RbrQBIBAsag/SGFw6ubEhhCTTaz25wM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x7Q7oC53TAmdhyK5oPgqo/+/93PR4zIU8azOGLMVjIPFQOHxE2NwqQmCIjbE47qSGBDv7HpV24Dn8mM4DP34OmKejvGvAYyOLeEUApZXniDGJAIiPZ7BR4UVWz2n2Jbgv9xELm9HmP/L4M6UYbhvzsvMMsXm23pdyJWGB6ssgwlOIcwr+6F2WxSrgoiARANDpKoGXC+n/1+mgUvDLuk91FmOpyf4jb7vf+3vqL+GxfjF36dlbeReq6XKj8fUZdGLQ9k/KOAc2rxKuv7bDaYWUfdOvLpKkaNYF2bSeOe53DrR3uRd9BlBY8VzUv7V+gAA4NieRhRc0m4e5rkqFJt8XKnTXThLZPFHw5edE6PdPtCJoJEZgh4SKu/9bP2iSq9xzz+2ipJ59loU3rkYjagddTGF5NyZPa+LpZEjf/kgdU2N+c2zx05eI1NqCGNLyx3y07JOTJetF8H9BBNXn0DRLpurwmtOyWoo6lio8pf4bUmff3vKt5FlWFgwZ7kTFRH9jNFbV3otFYhOazOykfe+9ErMiIF42ZthyCOxyoPob3+o09drIpyV0x5DTTaepITU07gqnn1DoCxQoCAoN3ft+Igedhw9Li7pbx54Dcw3x8ktrTkqNHqZyR6H0O55gtjBS3kER6fEvUVIhzQvbjO1srN+E8Gh0XTcixvNltf2l7uuQLB7BxtsZYZEMPlSS5lN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +9cqyoDIIV6VxhgVV+s5R/UmgEmnc5M5BBlNgjBfyuxJESzCUVrxfqzUAE+Z3Ba+cUg5J/okHVeqoJ8KE/bMqDzuwpft24JQSswuByjbfKjfT1ks9LBpMHHgJOkf2HK/nfj6uN+96r+TR2B5N32akdVDLPu6qJrfiN+iAWfnIBRPsrZfbAC3FUHK/8FgK3K7ftz7jRxfNoCxX/EMrLtaLEsjJfpLnjeMTuTiF373xj9rvSoc6XWp8PgoPCWqy6qPc1CfriGVBDyljtu8l762VNpwzfr6jVxACN/J0cPCzFheup2yGBPuvMdaSayWxCBOkzRiOuStR90KYwzmWhF+XtT3op0XC4eUcxMUoKll1AUfy9KARKLzwQBg4ZNEayOVReQptujT2qu25DsfMgsTPksPH0eruFdqUz8qqZpEyLN3aCKNMSnCOTXXlkXeU3H5D7EcKuBZc4ja6tBNT/TPmg6PpfQgVMa/7Cxdj34Xth/fYWPtU0NGEhNL3r3bjJbGkU46BXgxp39K0vUzFMJANDufuXKrtJcujAP8imVvW69DLWlQL0zlFnsQ7F940x7VKU0OQatWTzJDCjv3XRsNu99uDbGBnoSDs9u0Mb/DtALEoYQ1hnMxu5bRHKcLu52zInQ02B+mon7OJhrlHaDusuzpRly9HfMmC+2ZuDi/g2p4eecV2v046PCnjIUB0WQx9Ji1ZPiRr2Y9A3I1HrgdSlHQwXFzTPDRWKJzuOGEee2xbmveqDs8zPIwreE+HiXmYcD7ukiFDYgFqsaJE3A5rkdyxXVoUKRtoHedrdHdp00EIpDRC+yyDOgcBANjnIBfSdVzUmU2CIgNwzSGbQw3pQ6Sv68HQ73OZg2azbB33brfzjx5ynoYAM/pqReeooOnM0qu9GMoUzRC3BjKJeAhNpehU/OiGFuGdGorzDq0IVyGNH846xDU4+ohAVAC1rDIFDTCqxdkTAYWyqGsOLQSLxd4N3WfZJV2fuI6gsZypohu8gkooHPR8rUYyImjhSFucL1+6IMsPwC4JsQAGvq8SuBATOI13XAB6AXbIFU1OXqc/QpFpyrGW6r6ieyyq0GW/hVDu/87ly26EkSWkVUOQRzAaBOnqvGXjDSQtUcZAWQGFaBvD+IPxSTPY1vf8x+Ku/coDe/aDZUXJhhYO3Ob2WJNUJ1BRG3jI5LnkoMUhzulVD8U9iXW92xPz+Jl7TFCerMsE8qmGBCRE7SdwpqawhqZQ092T9V4vdbrWa77hAdVLQ590s5K3GMG5uuINJ6+Y/qmqI70vD2v3pgzQbtBn5Y27OBimsPIygPa/ICrGkYQvShT4qrnB1G7upemqw5R X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97c4c3d4-d525-4b15-fc62-08dac270ae42 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2022 16:37:24.4284 (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: DU2P250MB0141 Subject: [FFmpeg-devel] [PATCH 4/4] avfilter/vf_fftdnoiz: Check return value of av_tx_init() 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: ciz9O5hqlbqs Should fix Coverity issue #1500329. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_fftdnoiz.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_fftdnoiz.c b/libavfilter/vf_fftdnoiz.c index e74f40b4cb..f7200699c6 100644 --- a/libavfilter/vf_fftdnoiz.c +++ b/libavfilter/vf_fftdnoiz.c @@ -208,13 +208,17 @@ static int config_input(AVFilterLink *inlink) for (int i = 0; i < s->nb_threads; i++) { float scale = 1.f, iscale = 1.f; - - av_tx_init(&s->fft[i], &s->tx_fn, AV_TX_FLOAT_FFT, 0, s->block_size, &scale, 0); - av_tx_init(&s->ifft[i], &s->itx_fn, AV_TX_FLOAT_FFT, 1, s->block_size, &iscale, 0); - av_tx_init(&s->fft_r[i], &s->tx_r_fn, AV_TX_FLOAT_FFT, 0, 1 + s->nb_prev + s->nb_next, &scale, 0); - av_tx_init(&s->ifft_r[i], &s->itx_r_fn, AV_TX_FLOAT_FFT, 1, 1 + s->nb_prev + s->nb_next, &iscale, 0); - if (!s->fft[i] || !s->ifft[i] || !s->fft_r[i] || !s->ifft_r[i]) - return AVERROR(ENOMEM); + int err; + + if ((err = av_tx_init(&s->fft[i], &s->tx_fn, AV_TX_FLOAT_FFT, + 0, s->block_size, &scale, 0)) < 0 || + (err = av_tx_init(&s->ifft[i], &s->itx_fn, AV_TX_FLOAT_FFT, + 1, s->block_size, &iscale, 0)) < 0 || + (err = av_tx_init(&s->fft_r[i], &s->tx_r_fn, AV_TX_FLOAT_FFT, + 0, 1 + s->nb_prev + s->nb_next, &scale, 0)) < 0 || + (err = av_tx_init(&s->ifft_r[i], &s->itx_r_fn, AV_TX_FLOAT_FFT, + 1, 1 + s->nb_prev + s->nb_next, &iscale, 0)) < 0) + return err; } for (i = 0; i < s->nb_planes; i++) {