From patchwork Wed Nov 9 16:34:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39240 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp413450pzb; Wed, 9 Nov 2022 08:35:07 -0800 (PST) X-Google-Smtp-Source: AMsMyM5/611M3/RPjv2XzVykArTDBnInZymAlsUDsgaw/3k+dOM1Sj4MELamDj/lxubNnDWIILXH X-Received: by 2002:a17:906:5fd5:b0:7ae:3565:49ff with SMTP id k21-20020a1709065fd500b007ae356549ffmr1190603ejv.741.1668011706848; Wed, 09 Nov 2022 08:35:06 -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 i6-20020a170906250600b0078d2a84f2f8si11847345ejb.645.2022.11.09.08.35.05; Wed, 09 Nov 2022 08:35:06 -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="ND2Uo/uS"; 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 D6EF468B909; Wed, 9 Nov 2022 18:35:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074025.outbound.protection.outlook.com [40.92.74.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3BE6568B176 for ; Wed, 9 Nov 2022 18:34:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DkbQrWstL/hGb7mysrqE/hmVGlFSSjLamn050VYXAX8HaN4gqqfiJ+cva2Jej+2n/uDvacPX1qojELbgKgiwqVvQ584Oi7Gn7KTXPV28LufHDcd8RvtHYDx+p8KNJZQJ6wLbSdiHfoEbRe1jyJ3JMrR5zTfFZZ8xfkW2uLBnQ48F9qKahnxHbtlD7plzDIvvXVfSOIq3LQSnOeqLOY1tanMllppLCxrg+4fas0QqAKbYZCeC6yp+B7+JSD0yH/sSk6Juqv07UBzvliJjaN8WhbDm+PQPpwvv6gfmfsBDnWt1PGlydgNd9lrJ5Jyx7GHKVEBj0IlVvTwE5YHqBOFLDw== 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=6KqFzaaQz2Lii/lx2BG/imtg4ekbd5omge28icahN6g=; b=Hha9QXzNh7ls3/SGl8D7xeeTQcsHpcviaTRDthm6ctAD9Ca0CljXvslxeYZN2X+UbxjxrsZ2X5yF/PMdVdmDM2kOmvqrZN4wyFJouSskolVI6EoWyToupJo0PcrzOJMxW/b0rHwkPDKZE9B2MkuMH1U4AFCklbZEXNKXH4WEeJWBr39vOnE6EboGVlLyIXgjvDKpEA8AHU+aM7Y8Kzv/4+kDzJVP0IgD9xKfElfwd61VSRnVrXy5aqH3dbfOd6KEIrHAneEjNwtU5Bg8clUnSqbazVi3eEMRZ2cT/ILsxpReNrrnITBp67GhV7DQFMHFkH9EmIe5TMBJI15xnot/Rw== 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=6KqFzaaQz2Lii/lx2BG/imtg4ekbd5omge28icahN6g=; b=ND2Uo/uSmNi1IXeNHdIaw2wGIEoNrUSSCNTFwISbP99odK8ZuhfcHZrF/jH1521arKR1dMEdTt1qQhHazwe/sfK0JYmcbFaEjIsMtLLBep6hQRJSBwhit+LFy5oLdrx3yJsYjDW0IsOh2pxfmOlvgPzzoiJCLirwr9CTBZFk0X5xVXFvgfDXh8BwHa1/2TQ/CwJAsSgygI6zJjasyUHpyrUAsiEhjVbqjf3NLCcnNNHpud8wc6uZdO/a+6wnD58m/1igh1H1CCwJZr9i4OFHgyBwLdqY3ugGvXW/7K/aYNHpH7Y5ZNsBZLLzVyQwGPHcumXQCEsrsgsNx3r1tIba0g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0205.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:276::19) 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:34:53 +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:34:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Nov 2022 17:34:58 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [bsuuBOAapjdqD2GVI8qvXthEFYUOcdJ7w595Nf0+2rQ=] X-ClientProxiedBy: AS9PR06CA0266.eurprd06.prod.outlook.com (2603:10a6:20b:45f::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221109163501.344932-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0205:EE_ X-MS-Office365-Filtering-Correlation-Id: f039252e-d742-4190-eae4-08dac2705402 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqNWn9S1x2PUOFdlA6Fd+ZoGyeHM1t/M0/m+9Zcxy3qJLFWByLFsR6zyAK3qDtrbVqaJ7wr4+fi56k4g6lu1KHvMwv5NATxwSW7Kq3Ud5SBbb7hw+jxRSc9HzyuvvDhIRlfwgixSyctCvI4sHK4//FuKz1VqKbqI2qxXs4RakHYB8ir8yUEBPd1zuPbf6Wf6to20qpFwWVCSbSAKhIBjnHa69WrRtOlQ9WEyCwPL49kD10BvLU5CaKqGcFODg8oHP7yy6scdU+5RDCjI9RAhomIgLTZPILKh/qA++ZWZhj86aMeFeH3ZDZBVuJ5C3zjklyohLJ9y9Pj7Qn8ovvKm7qXgm3opQSzmsOfxZeX72gBwIXCWq9sEK58eZIewI1UG3QiPgEIPnkJAK2BNQ/xzUjuJ+3gVLvz175eU1lbV8G0wm3B/kjnZldkcGtDAMvpRQfdx4bl4oJUx5KD5U/Qn4Jy+wy1b1ZLs2KO/KlGvmVVQf7nIVGcOZgv12/D1cg5WwUNw8pZuWkY/VBE5wgwDkNKS536H+mTIsQf3rwsEb0ixk0Pv/nLJOFajJugL+S4Ijw2RoNMJhCpffxeQe/4E4yimacmN4IpxvnXgL42xMi1mF4Y3b0SwFAIbyG3WP0LGWe5JjG+suVaR9Od6Kem3opmhtVqyCil7XTzUmHI3QY34BcquffQXensP1I2vQrgNBmTSoq1FwVgoePSl0AFnbLBpdGw1R5YWxe3gzXtLhApPc2438X8/lXMfn8nPSIQuHI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tRSk47kyxPlXQ1/mK1qwg6kZ3R6QcFO5mtP5kcp7ZoPCd7xgzviK4gJc10jvm8KDYRJ+Zuvj5UXB2kSM1fjtW9hoNcdzH1U0hFQxYkbPC5ZUBJlY4i1qN86YZxeLfmb2sDB3WhmbFvnnT1Oggh+psWrjDRDk6M7ZfzAEyhJnlx3lZ++4SsxeilhEQnOpRA7ds0289mVS5lArf8jtgr6rSB2xBVT9IKeyWikikKBtgi0hPWKCpCJzA/K0/PtwNAmwIM95F9o1tXEoZY2wpbFq2dxbc6i5aVmU5melxKZfR7m7ek1WQGhHzr+PfOB4fJDO6oor8/nt29hWLC/muDOBs5sxLGB8rE1QiwP7uus6J4YM+XT6zE2nOVl1XXYjPRzPjFLARvkNg5I8eTqAZu7HTq1rbDzyrsa+/DLsYnnvYw49No741rxCqXeOmHnL4oLQ2xkumk8TmSaPsm4NACpp1XxwQfE0YpVTP6ItQtF/5A4/e7pW78gQqjzJ2ctz7G+NngZv7LhmLg4xoWhvJa8xf2RDJq+lA12IoPs0zpCuZitROv89ReQE07Vykghmcx/Tk1NqHIobXk5ALu39lPSLXYoUNjf2xvmH4xJ3uGQxGL4pwcHOda0okYoi+7sHKGtUBgtUxczItGuR8ua5J5lz+LAqHRWMy/PKKTvHF5q5jCDX4yo6wDTZYXpuffqN9ZQy X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0ipQ4i2LgmoqdPAKsOxDb/xTfD6dphGM+hUUV92Jp8hXEisnYnlCFaHZQzo02lIcJAukmuHOe++XIpxyklNYyXefs1rATw5mbcFUASTMOQSbTT6niSMTWKBdshDkMPAtlXR93Pi/YqrnYj5bKT2NL7VcWKRUE8Ky+OBshPKVtDC43arMz5EFE8ZtKV2DSGtJeVmqayC+/hoikjBmipnNVeCXbpqHPYNNRA1C3whT6uJ8+bHxmmgF37RgPIDOKAhVazQy0OFe8uDhPXdj3IVVC/oFyPBVWNwhak6seRs6kxnEk7Xw0aTJWos9C9bosFt+861ca5o/qi7yKXbN7dGJpdB5eu8Z2QYlzMgB4colS6DHFpYTCfIR7ZBHauwB8SmdWsibYCZqYpN2FTD/T/hx67Px+wRlKlrfPzk199UmSZwNNezNL3LgpTCV438pb75YYwl5mIvs+JWzu082MFg/K2dN5sIwy//pHuF4lEGe1eD6GTl1p72MHOWUaFev/hnWEZa1WfdHIpL7HoV1GH4gbKZjThhrX/IOO17V9IDm7QLcrAXfBMMxgWXIH2C39prurDRjNNwXO5L05Qt/sodewC+fdpYItk4C001zW9MoNa7AW/bkeeARA+cnocyPwHMw2NiUnlad0kOLOHPZTWsSNfpSNEm5Gli2zwFikdrvg7zO8e/ahQ0mjn/TlJ+Gd1HPvx7AJcXUcKqYkmS6eCqoJZM3zFPc/rxfcp8D+fYJoeCHHVVCZduughny9G3t5EKN2BoxeMyK5OgpSWcA0Z9hRUZ0N+YmELg2DQJgMjqafEKkONWnEr9dEBL/3bKCcmjnXU3ByKbMKDlZPN/JQccBaEcx+VxMHm6tu2RduK7SqWUZtl2vRP29+9BcRPaKLyU+DxCiE7PjzQr0eQrz0B2zTiaz0udXm6y3c09MLV6HBnZHmY6XOueXZTph8lzbFrhXzAH/7nEjBuHZLx6qi2i8iP50x5/8mnF5zK5Paph2gll/XOgvWKPxPu4hALu0m6L7TuNtvUqAfzz/s0g0SdiDV6Q6Hx/5crii467cyr7n1jLCoOZPftMi8cfO7/eDJZq9QYAoyE+I3qbcf/gaINMUpch0QfqiDZ++/mKAFPFpjIkVO/2MjZWO2NTFPd2akgPejrL8lCHkp1XxfrsnuG7h9KPSmcSjWtyv3x1tL010Or9g0MPmgI2xmPpDl+1MDv0y6E+K04V2uRJteBolb1ENKoKn6Yh32IiH5GH2qvSdIXxv7NqaD5TsMGd/kfeE6lGFAQaWP82diLUUlZA/Fvnmqat8tzpPWz5RIUgubPZQ1h4Asuvwi3KZsU18Nkq+Lbva X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f039252e-d742-4190-eae4-08dac2705402 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:34:53.0605 (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: DU2P250MB0205 Subject: [FFmpeg-devel] [PATCH 1/4] avfilter/af_surround: 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: L8J/L8Xpj9rS Should fix Coverity issue #1516766. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_surround.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c index 858fed609a..969325cf6b 100644 --- a/libavfilter/af_surround.c +++ b/libavfilter/af_surround.c @@ -194,7 +194,7 @@ static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; AudioSurroundContext *s = ctx->priv; - int ch; + int ch, err; s->rdft = av_calloc(inlink->ch_layout.nb_channels, sizeof(*s->rdft)); if (!s->rdft) @@ -204,9 +204,10 @@ static int config_input(AVFilterLink *inlink) for (ch = 0; ch < inlink->ch_layout.nb_channels; ch++) { float scale = 1.f; - av_tx_init(&s->rdft[ch], &s->tx_fn, AV_TX_FLOAT_RDFT, 0, s->buf_size, &scale, 0); - if (!s->rdft[ch]) - return AVERROR(ENOMEM); + err = av_tx_init(&s->rdft[ch], &s->tx_fn, AV_TX_FLOAT_RDFT, + 0, s->buf_size, &scale, 0); + if (err < 0) + return err; } s->input_levels = av_malloc_array(s->nb_in_channels, sizeof(*s->input_levels)); if (!s->input_levels) @@ -263,7 +264,7 @@ static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; AudioSurroundContext *s = ctx->priv; - int ch; + int ch, err; s->irdft = av_calloc(outlink->ch_layout.nb_channels, sizeof(*s->irdft)); if (!s->irdft) @@ -273,9 +274,10 @@ static int config_output(AVFilterLink *outlink) for (ch = 0; ch < outlink->ch_layout.nb_channels; ch++) { float iscale = 1.f; - av_tx_init(&s->irdft[ch], &s->itx_fn, AV_TX_FLOAT_RDFT, 1, s->buf_size, &iscale, 0); - if (!s->irdft[ch]) - return AVERROR(ENOMEM); + err = av_tx_init(&s->irdft[ch], &s->itx_fn, AV_TX_FLOAT_RDFT, + 1, s->buf_size, &iscale, 0); + if (err < 0) + return err; } s->output_levels = av_malloc_array(s->nb_out_channels, sizeof(*s->output_levels)); if (!s->output_levels) From patchwork Wed Nov 9 16:37:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39241 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp414740pzb; Wed, 9 Nov 2022 08:37:33 -0800 (PST) X-Google-Smtp-Source: AMsMyM4NK98GbXB5lO6FZzvvyz2vN/PgBbHBoL0zRGPY4K0VFPHU4K47N3M7iB4ySu79aEvoxJ59 X-Received: by 2002:a17:906:b303:b0:78d:9f46:5b6 with SMTP id n3-20020a170906b30300b0078d9f4605b6mr1340871ejz.158.1668011853018; Wed, 09 Nov 2022 08:37:33 -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 g15-20020a50ee0f000000b0045782fcb80asi13495534eds.225.2022.11.09.08.37.32; Wed, 09 Nov 2022 08:37:33 -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=q1kumLlM; 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 4BC2168BA2F; Wed, 9 Nov 2022 18:37:30 +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 08E3368B52B for ; Wed, 9 Nov 2022 18:37:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OysF+fL3bv7cA80KTaZNDpGZQDunN0PxZ9QQTk/j8HpWNgG4YS6NhGWH1zFXfJ4DPNXkxHFM9y4PcLR7xt4TZikLgeIeJFqtdp9ba80Q0gy8UwEu+rO4E5jthBvUCaeSv7E8pZWsSfCxRa1zEcQAi/jzvKu0tbMzyX2L2J8WEhqynWxRzLShwJ4M/cv6m+oGU78jrA5P+4Q8S0UTz4s9GmQ5LrSQoJz93s868KP7UgX+OGtMLreRQyp2gBjOmQbCY5zYjz5BINdp3jTkDcFLijk/p1eosJYcyoqPcBAq/o5RTs+AEHR2/6Y21m+7GcP/MzOKACJZRrKYULcV+5qf8A== 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=QS7067VEtpbntbQOYPViFDoQ0dN7QqDQn9iHQvD7jL0=; b=hf/8hkj7oEuAuT23AF6W/Hb7buM1iXOAuUSYvN8nBX5qOlw+fFHlN2zSwCwDpNgaLB47g8Hn9HRKpAhcQauNXqwdtWIVBr8lclovyvx/kVYZwHUKMTQ0M3T5aNW0gAQmQ3Yxubp+oHy6nPWIfcnZoHmnoa0O674R2iQdmG7hpGA3zV9Y3s1ak82HWVm9k6vL+uek3Jggj4vEUxJItPuptcZiwRGzI+nT/y8gZtpbb8+6uvbIXJ+VIar7tijWcT43zoYI8Z5pjRJDD++Ng5fn+GfKJfuTNTNAybGnzwxuW7COAcaudpZ0uROCOtwFKCMGCpDEoADmpD6UwwnIuAis+Q== 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=QS7067VEtpbntbQOYPViFDoQ0dN7QqDQn9iHQvD7jL0=; b=q1kumLlM7dhVOgwfxmTW7cRRH9LSxlGphu3Mb0gwUDEsBQy1LbZKhrGy3aVsi0QJgmvUAvyA13DCXrTzdyNx8lZpnp0XHYgrA4Jtn6TbV1VTHi9eghx7vNmWpWaYApBJTJoOcnSGo05ebV1gJx/2edydXYBxdVPoabulzZzDgTupmkjG/ihxwFU9LNXr5zUn6jrvUjP0GDErcGEXgge0+ndKTh9dDf5y/LEc/vbBa7p+5/rVBK3AHiXFagtz8Merneey7RQBuhEOYAbxdL7PAUcfyRxfkG4St1WCzsFzp5OCDXGbpsK2Q7UGB8Hz+6vggkFNqUbiUAXosBENKKZS6A== 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:22 +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:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Nov 2022 17:37:28 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [x9s11k3eF1VGwOOXLDk5czZ1l0mH8GEfkZT3PQ6GOmI=] 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-1-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: d8099b4c-ad67-47f4-5335-08dac270ace4 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqNWn9S1x2PUOFdlA6Fd+ZoGyeHM1t/M0+dHhBnYqLZYalfPrKrhRihVbKmBSsFr6M8Hw8XGd6YadZkHbBLVCc3gktSUDr942DLCRmOci0gwScLIPdby9LbKQEKFPBj7HCOk/Q48rqYfkBeaiXBeXgKp4rjjIkoqg0RBKxDSCFnzs7K4dz62FWXo022hgnq+Gom6EsHj8CermCviRpSoCvEFXh0cIjPgHIVRG6LxGRcyod7aEGoGl0k9MeimU0m2wAI/D8oz3GdbtMyV3KXCyMY0ED1kqBMKrxaIlED5XTg3YC7Jh4XWkic+0suGusZCSoUfrVVtekZKmAqAuYhlWdTR3QVeJaaT0XgUeunMsSft73oNOR5Tfzx6XYG/BFvyGWwTS0piL1XAkjuic6xcr7TSYf+DqyzT9/pyWRjZOu+4xaOLhQdgxvIOd4qY1uuBiK09aFjVCKx5ZctlQK5x0FRcxOT8i7uosbORR8vfOkpKDSIJK47Rxg+nx8M2hB7DbvXOrYUGhezSKzSIspFqqaCA1HRVy5JVQpyObFk+GgXSC/fospkHn+a9+wDLSpUtX6kE0fkUIf0S+ydBdvGvHEpcLVSUYvx4So7qCkLo6lzWchjWAK4SnEYt1yqlwVfDTkvtHHoiWO1Omvgk2zKP2+KV5SpCibzLGY4WiaDzPSlEAmhjTM2ZUtBmu8XzYBsZkpkBkCQjjlnBU+t7rASqv946KGVa3IcHVSmslpeXhE3gImTxxpx/q7PcS7Lo6K7DiY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: imMjpJa6lvm7IbbS/FgMzIOqTmhkDvCHg30HLWY4U7D7S/cHCfWO4vBaL0DkuwKwKeiC16FXQ9Vw0QGDsygPX/em2zMra9BT1b7dSOVQpJN6Sw1zyo8Wl90WztlN7nP33RQGvxLJwdaEjDhFmR8UHQB70mlKoEL8g1KRMPt5xfCb/gz4LeJ4n34LePdZB1gNXbNjxrXL/+ooo6PrUoSkXSSrlAZBe8he/8aAS7Y74pCefRpCjvA05LFadlH1qPfM6bXdo41n6rw8AM2qdjo0qkj8oIgDcwIqBLgiCNgXQEoncRhk/ScsLKsRl1aqhfeN/8A120JQ4iai2puXnHCvJ1ZaQCOYI/MV1b5XBh/sSGzlqXIBkfSKaBmJfRaWo4rJTvpzC8oeLUufT3KW3cYh5UR26F2Xs0QROmNBFJtI0vFmMjqjPwLRyb2RTbthMdO9s2vFEBO+dINlFOaHMQukSaz7LTujKDH4wLJ0BNicyibcF6cVHA2BZRfljmxV7kVtPXuK4vq1sAoAK2n8PIo9PGJkixV7jBq5gtulCJPcbukOyvlxsTt9LeUtIBSa/4DaVfA+VjkuNDf4ZBVqa9km+QJk5DckI5zxxYFbtnR+xpVoT0NntfXzhwv/hDEfcaHmOTO13HGs6RkQFLI+HcUbC3WRJGtoQ/N0Ps1Chrt/LCfjt8hzrebVUe+1DVsRhUlr X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vrTFaF4yFgkh2aR5YxRNro+EXbi3fEOiWEhhLPpMYCMeQUF2STmZwJAoGWClm37MOZtFEB0oFD+vR4EZDR3s9T99Ng1ItXujwyejjZEkarYhQLK/r7bNCtbLFyerwG/qCg343TKBHbP/q2X1+uLYo/ody1KtHXjBgG6omDNcTPdLMLtpSSfYlsbayWrxcvkqF99/ROhLbVUpKkEH+0U1pc0eXBZ9L+hGwfNLyf2f2h/6tKladJf7NkEfu2VqjuNYtzBWm3l9kIX72F6e0vtL476BfMWrumU+Yct5oKXwiuK+s7jJ1hMUatC8oq2FX5Vqwgr2oRGNALaxqdpxrtlR+gJFkV1MKiD5uUQyWyisTAg5xK0gjOjTMo6WI+yOhBe12ndqCuMr4Nw7o1z7LWcFvtj3geRawHgdXqWV8lmA/K/yn+zeWpFtTBsn89uKBZR8q7WsOPfdT3OL9qVLqDnbEBedqC784AdJR8yneXItFsYR1KSOQBN1drIU3mIocZUwrsL9iySmlOJdJ4pFzUkjwsN5cLzsXzkUVWl4Vf7YK6Dce3o9oc3BC0cJVwk57G/z4JCplCSwWOE/SYXsuYULGOBx4JEpKDZDqyiMdv/DDGu+BOEBWRJFFKlm2Dt8088SZhPeVvmwjAGlQ+ln1WITRPb3av69iLbDnF9VgeL9DaqWLtJcjvBKSuvlejd14cVP/CCJsilUmouOclSdYTiW2sGR5AHlHVOQ6XKZMNi7vbEkNqCGHv8oma1KWIEdkf0/TO7VETczHq+DC/WszR/5zKtJ5kG2MTscx9Kio/QHmmw7TS/K7BKV0RoEFadP/5qtTkaNoLqcW4bHvwnJI2tqhO9V1W188TFhHBUbKTepdV/ZBc4b/VUHMErFosqkJLtJvfZ+8RpakIWPF62bsh82pyvXqBofEOB8Q1OZ+y/YZhDRIMXImkyqVJY7SLM8HTeBbTpkCjjBQlaGrZjixvb+8z1TvlNXK0sdQvAzxTkMy6V/cuDdo/HEAXQ/EboesEzovIturnrY+B7sWtLqnHCMiKd3QQCJhJzuAiwVBDyVq4mjEA2v1rAGJGXUgC07c7jg+IDoZQuQwvaMv91r6qfyiPhJ8Atf11bF3kV4EhNfMqNajhHhtdLZyMSZA/4ULWtXlF6mYCw9KP7iLzx7JjpD0SPDIqH90furz9zP6zG7lRzV4UaC6C2wKSh/5PJcnwP5+S0V/j0uOXb7lAmHuVGokjkEW+YsZTnirKXzS9dgMDTDR/SIM9GrZuUQJ4M2bKm00R13GgoUXXqLzbXcdFu6sbI0CPDKDFlHt4SdBMtS7xoFRuCZdIZNyLCB32wJoqgG X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8099b4c-ad67-47f4-5335-08dac270ace4 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:22.1147 (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 2/4] avfilter/vf_fftfilt: 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: JxUOULmpfUg+ Should fix Coverity issue #1516765. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_fftfilt.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_fftfilt.c b/libavfilter/vf_fftfilt.c index 067ce7eb30..231e74fd72 100644 --- a/libavfilter/vf_fftfilt.c +++ b/libavfilter/vf_fftfilt.c @@ -306,7 +306,7 @@ static int config_props(AVFilterLink *inlink) { FFTFILTContext *s = inlink->dst->priv; const AVPixFmtDescriptor *desc; - int i, plane; + int err, i, plane; desc = av_pix_fmt_desc_get(inlink->format); s->depth = desc->comp[0].depth; @@ -335,12 +335,14 @@ static int config_props(AVFilterLink *inlink) for (int j = 0; j < s->nb_threads; j++) { float scale = 1.f, iscale = 1.f; - av_tx_init(&s->hrdft[j][i], &s->htx_fn, AV_TX_FLOAT_RDFT, 0, 1 << s->rdft_hbits[i], &scale, 0); - if (!s->hrdft[j][i]) - return AVERROR(ENOMEM); - av_tx_init(&s->ihrdft[j][i], &s->ihtx_fn, AV_TX_FLOAT_RDFT, 1, 1 << s->rdft_hbits[i], &iscale, 0); - if (!s->ihrdft[j][i]) - return AVERROR(ENOMEM); + err = av_tx_init(&s->hrdft[j][i], &s->htx_fn, AV_TX_FLOAT_RDFT, + 0, 1 << s->rdft_hbits[i], &scale, 0); + if (err < 0) + return err; + err = av_tx_init(&s->ihrdft[j][i], &s->ihtx_fn, AV_TX_FLOAT_RDFT, + 1, 1 << s->rdft_hbits[i], &iscale, 0); + if (err < 0) + return err; } /* RDFT - Array initialization for Vertical pass*/ @@ -356,12 +358,14 @@ static int config_props(AVFilterLink *inlink) for (int j = 0; j < s->nb_threads; j++) { float scale = 1.f, iscale = 1.f; - av_tx_init(&s->vrdft[j][i], &s->vtx_fn, AV_TX_FLOAT_RDFT, 0, 1 << s->rdft_vbits[i], &scale, 0); - if (!s->vrdft[j][i]) - return AVERROR(ENOMEM); - av_tx_init(&s->ivrdft[j][i], &s->ivtx_fn, AV_TX_FLOAT_RDFT, 1, 1 << s->rdft_vbits[i], &iscale, 0); - if (!s->ivrdft[j][i]) - return AVERROR(ENOMEM); + err = av_tx_init(&s->vrdft[j][i], &s->vtx_fn, AV_TX_FLOAT_RDFT, + 0, 1 << s->rdft_vbits[i], &scale, 0); + if (err < 0) + return err; + err = av_tx_init(&s->ivrdft[j][i], &s->ivtx_fn, AV_TX_FLOAT_RDFT, + 1, 1 << s->rdft_vbits[i], &iscale, 0); + if (err < 0) + return err; } } From patchwork Wed Nov 9 16:37:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39242 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp414792pzb; Wed, 9 Nov 2022 08:37:41 -0800 (PST) X-Google-Smtp-Source: AMsMyM5IHEuP1orJIgGiRoCjOyldu4g2mbz9GbGl1KivkUHQngLQAGWjwE7pFSWCOLAT0QwqSA7C X-Received: by 2002:a17:907:25c7:b0:77b:c193:9230 with SMTP id ae7-20020a17090725c700b0077bc1939230mr56753421ejc.316.1668011861076; Wed, 09 Nov 2022 08:37:41 -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 wg11-20020a17090705cb00b0078d6418dcb8si17326388ejb.456.2022.11.09.08.37.40; Wed, 09 Nov 2022 08:37:41 -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=qGVOSc7z; 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 5758D68B940; Wed, 9 Nov 2022 18:37:35 +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 2929668BA62 for ; Wed, 9 Nov 2022 18:37:29 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BmS97rBc809BkbUC3KxX1JGv+HPhOC6EYzQlkhzOQm/o/KbtO+K0vwHgVVvrmC0J62bL5OvNPBZVUrRblQBBuldI/xiGCQECOUyb2qA1mzGdQCFC3rYxhwe32q4oauZt+6+wNhtZIFX3gAMv6R01MCF9BBUGrFpXS6dvUekzX5X3QkJBH0Cx5MxrA0ORhECzjcNiDzBZUEZbqwTgzVLstQ/5v4kKogybTlOqWDfkyfxBRLeeYPxSr2/cZxSuQNN7+cREGPy0NrK55XuDWCjJBhjuE2WC4jaDoXA/PDAUMJCOBbfbXUyP3CpiGBdYNZcVy9SrckYUP7nU7x7Ocir/wg== 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=hgiR2XZOx2gnN7MsWbH9ir5XStewkt/gMCrAmTDhzag=; b=jF60l5kE3+EGoEq1XIXGecqpAJbI/Ul4fy9J1cpqUnVJEs13j5q9n9wIlVRH2wGRMWiTpIx7gk1bM3brlDRMsJ8fH8QsiQ6aKHriAL3tMJL5Z792XjdMuZ9HmMV1OHpmdmCdrDhU2j+5IJ5dnlbl8DN5VWFaQ3qwuhksz6L5I4RHAg9OGswmz8JveeEe5bPymfm6jTodlBSusatHQsZtv4dk9GLgYb6GYEd4Mp5okUviJSR2rSQM7yK3a4Os+apUOlkHcMpNvPJOrl9jioRFZNd8xNsek/+781j822gwgj3KojJtodbf/EEFh+UfLb08BGv9WVsdZ8/PjcxXE2lzRg== 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=hgiR2XZOx2gnN7MsWbH9ir5XStewkt/gMCrAmTDhzag=; b=qGVOSc7zailBtHbN1ebW/0iz8s/MDXyjQhfalqHHhxBoVUDGe5pFJIG+nyEatuLz//3VoAQiLLIishOP2dgwvqYZTkvQpsBhGYtzxMoXRy8u3vKNf6OI6A1ajGXwAcZBQM2gsFsVxcgGfHc/eFW/rNWHsgscnLWPYqGNfAcCRGvtRJP+OrdkfYAhKVYZbzts05xf+ieooh5zwLLkhQhud4BWF+yLzRFcA4KF64iOHt3YkvxH2uCnYUgJ97UlY6tZHrSLFIvhZE6+sfkZxfY3s/J7Ly5mwGrzS/95Mg5BrTM9ugreI6MMFu1hePuLF7KnBV6O+VcQ6yL9FvTyIU0uQg== 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:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Nov 2022 17:37:29 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [lb8AjnLDxMZgaguG6u0yNgiq6im2PhkJYKrIRZQlVeo=] 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-2-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: 811ee935-9a34-4a2a-9af7-08dac270ad86 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqNWn9S1x2PUOFdlA6Fd+ZoJAGjqPBbK7357UEmh9B1WPx0KrI/WUj4ag8jtqXZ8j9DMJEUzGQDEwxRvVecOF0bKjWPODDaoxJ91N9ZKIlQ5emxi6224//bvl3cZY5mEGCrk/ZeRXxdVtRFcLQNbz5+L0MlpdiWXccBj8dBTiWKABSyHfX5UsrmjnswpfiT/uxPuDne+ZkTqnOtDh5al292Wh47Hnp/psvJJQ0JzaZMNenI63hN2PU8uy4utu4PBaneTt0itxEbf+S5wanxjfe6U2GyjG/GQbX1977hk8i1OVMCp3akviiXG6AAngTrwzv0X6ijZ96iiZ3n7D2CR1Zzg5zqqx0yRWy9D/pkmlCx+Gk4C3Z/rrmtPGVBZ5T1DuhUGaUPSn6fhbTdnkvsSaJ5S8UEupUa2nnFPSkGYM1u1+z4NlQfgCE7YUce4G9SHNcViplU3kW4KJ/EczbcqsXTHiE2m1JlYtYScaCK0BDw8Wpn0/MV5luQQ6/16uOeJoXx6KU5qvuUjmE/K+/tGo0p4gac021RjQD5V6UdS2dRvcDIeYuLZhvR0dm2fOwoLhKO8hZLlN6uQdakwxYgiLTMCaeUVddtZMSuaKBk71Rl5mye+dqt2NJz26TLSuv5KSt+d82TepjVOqJ7D/tXBhJ1G85FhBo2gkdDm1CDsrY7LxUi85tR/ICTRfEAM26653VbbLXLG7F2Uh6A0xGLskqzoLm3h74g5e+VlPjbnfKjdpVBlsN1RvRyESZNFNO6NI8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z7EVW0Oag7mLhXGxH0iCYjv8N/JbZLiPBJTVkEoscvKcrV0sc8DTj8SydVm5TAaSLS9RMX2N1qt7YD/sWOxPxhTUBwuHstrFUxr6PnDEwr/YzGxpuYLq6YhLB72TsfJfHRfcEibTtILeBDGN7kZA6Si7O4QwMdD3waYuqt37KqVYM9r72BdYBSxhg7bxLa93Xx0PwmanI6+j6Zy+aoQRSWTM0V5IYKOajG3Xr0JnLEnM+h6lY7xct8ePYkJGGYRByE3RbNNgA4Gjy1f6ZtxfD6zA7+hAwRpxg3wUivl3+hpM0eDAe5mCg/ZwBj8GXiMyskWYPzItQ8Z8LAeLZkXbhm8zpdlO82cTw04Sl1+/hVtna1pLwWWCwudnn92JXODXW1kiS7Pf5/n0dFb9D2gFSXtvPUs3GYvASDKy05FMkk0B8724hch6L/3wWmWZR3Yn6/hMF32IFGNBqVEPmq4PIduK7MRRBsdU+VFgJRHCZdLFmfRxR3AaoB3BVzSplH2hTyENO5aepo4llktVXl2NwbpWTBv352/jNRWw4be02avXQ+iSF3WwmGuytA+9ijVBdYIbreuZvGM8tOb/qyl2Cr5SYCoR0zjlgBvOITu9QBONu3W6QEk0t+Eeh3CcAwYNy4xxE7CKojUj7KiI+gIR3beag+/T8Zb+W6djiqd4yacsSFr681sCLYWzy4NcXMby X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eXY+pVt+Ji8pnUCgNV1gpU3tGwlIEOyd7W/p8VSZj3A4e/R0HRot1JvEcFX6Aw5drqkpHyItmL/rggtMCnqijr88bwABJk5dcWSnvz02I6YthMPxMy7O+FPGlmv02d2l29tjBtSAjlNq0qN38K+QjkAB+OfXvcX0RRBVDAemUOi4lj+TuU5v+/zepjBBZFdTcwz9iYj5iuk8Oorq5hTyjH3IxFB0y5REpSvB3L+NzhsJm68QToUjEKF4ykNlvbDJJVDerwyQOqy9h0Hl4Xzgi8leEKnnAgJCj8BPnh5M+el85RvAaXE5aQDslXd9TZhHaU5eWcMC1tSP+hEwY0Fak0nQwBULPHwPnkzJjbiPsLmvw+CsQD8u1pvy/PWx1nqfaAB7054y3MT88s/XT7f7oQYVbxoGe13cBx6iSgAnz3AoIuzFnXANCOXNnDH99Q9LLGuIY+wIk7RLbXgADte4imEX/NrPIS+00t9w6XCgzn8Teeugmvka1j1m0svzxXTCsgHxpBod3zy/2w4FyqZNlOrdGQS9rUrkKoNdm2Ycq+AJOS5YG3sfx7S6OVwuCg9wCfPBx4yW7qgrENXN3gRP0EOPL0UCwJgBtBWEcEZiYFtrqFvg+vOnGZqlLEm6aegL/SqFqXb0F0L+Eq87tXm24BBJ8+sernvDmpT3pSsycSORnLbs8B39PXcmzC/TZ0vK94FpkFFPLneEKBazx3hbbXhCTgMQkTbK5caUwUNjOgNL5Wj0/P/IbWDqVXM6voT94vKCIRx9EgjfNnVepeueqaTHTY60Bwj9U5qT4dU/PbhJFTAcuCmJcdYb9AiKNbg9T6WcYD93iVjnW6dVbMVmIPH8+fhKTdB3TDmBDYfGgTAx7uOt5n0Nn4oRfv5MxnyvKK3vFZ/WboM8AgKdnqoqSolSdRzSHBxxOhJyTmOwF/EvfNZy/pvsXAzP5g0K+OGHeXDt4GnlcItRBoKO3TTK0P40tk5BjDcz74EnS4QL3x6uyP2d5/7ud8fKBybM0ohi8leG3NNJfTBMrr26yR332epXiyU0ZcTRNZON8FYYOYMaoIa89xwk9Gk4dA8qNeuIqnFxEdwk+5+GbZZEcySI6y8j/bZ1erCD8KTHzN8aa8YzdPi/KF0dCUKFavMWeebtf4cR48RhsYwHy1N+C/rkch4XCcOonAuuNMoS2AGCQWcq71DXOPjaFOtQAso23WBfbph+vcWwWmXgqSosu4StYmkWu1QRswukBh8TkfI7D8gW6XD2txZyWcHo2muAGK3zE3nkLBSWHrPvS8iF3kfSBjkGhAOVzmoKhqKSC5Q2u/E= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 811ee935-9a34-4a2a-9af7-08dac270ad86 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:23.2398 (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 3/4] avfilter/af_afir: 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: voOclvnUr9T8 Should fix Coverity issue #1516762. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_afir.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index e1fe7d6a64..910999cce7 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -158,6 +158,7 @@ static int init_segment(AVFilterContext *ctx, AudioFIRSegment *seg, int offset, int nb_partitions, int part_size) { AudioFIRContext *s = ctx->priv; + int err; seg->tx = av_calloc(ctx->inputs[0]->ch_layout.nb_channels, sizeof(*seg->tx)); seg->itx = av_calloc(ctx->inputs[0]->ch_layout.nb_channels, sizeof(*seg->itx)); @@ -178,22 +179,29 @@ static int init_segment(AVFilterContext *ctx, AudioFIRSegment *seg, return AVERROR(ENOMEM); for (int ch = 0; ch < ctx->inputs[0]->ch_layout.nb_channels && part_size >= 8; ch++) { - double dscale = 1.0, idscale = 1.0 / part_size; - float fscale = 1.f, ifscale = 1.f / part_size; + union { double d; float f; } scale, iscale; + enum AVTXType tx_type; switch (s->format) { case AV_SAMPLE_FMT_FLTP: - av_tx_init(&seg->tx[ch], &seg->tx_fn, AV_TX_FLOAT_RDFT, 0, 2 * part_size, &fscale, 0); - av_tx_init(&seg->itx[ch], &seg->itx_fn, AV_TX_FLOAT_RDFT, 1, 2 * part_size, &ifscale, 0); + scale.f = 1.f; + iscale.f = 1.f / part_size; + tx_type = AV_TX_FLOAT_RDFT; break; case AV_SAMPLE_FMT_DBLP: - av_tx_init(&seg->tx[ch], &seg->tx_fn, AV_TX_DOUBLE_RDFT, 0, 2 * part_size, &dscale, 0); - av_tx_init(&seg->itx[ch], &seg->itx_fn, AV_TX_DOUBLE_RDFT, 1, 2 * part_size, &idscale, 0); + scale.d = 1.0; + iscale.d = 1.0 / part_size; + tx_type = AV_TX_DOUBLE_RDFT; break; } - - if (!seg->tx[ch] || !seg->itx[ch]) - return AVERROR(ENOMEM); + err = av_tx_init(&seg->tx[ch], &seg->tx_fn, tx_type, + 0, 2 * part_size, &scale, 0); + if (err < 0) + return err; + err = av_tx_init(&seg->itx[ch], &seg->itx_fn, tx_type, + 1, 2 * part_size, &iscale, 0); + if (err < 0) + return err; } seg->sumin = ff_get_audio_buffer(ctx->inputs[0], seg->fft_length); 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++) {