From patchwork Fri May 7 06:46:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27640 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273603iof; Thu, 6 May 2021 23:48:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7zFQh5nYQNJfKMuPYXqtH39hxw5DIpUW/l/y4GzA+XWnrAzt8Y2qHkNiClGuXB57gK1/p X-Received: by 2002:a17:907:d25:: with SMTP id gn37mr8100927ejc.538.1620370093315; Thu, 06 May 2021 23:48: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 s9si4381740ejv.428.2021.05.06.23.48.12; Thu, 06 May 2021 23:48: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=KfSMZXVw; 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 60025680B73; Fri, 7 May 2021 09:47:21 +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-oln040092069107.outbound.protection.outlook.com [40.92.69.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BEBA680968 for ; Fri, 7 May 2021 09:47:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gWEKPzY+L5mg+uHcNxcRogsEOwfrPxWDz9SeFif5M5z+IRzj9ORkB48gweBbQfLTmlqFmEbdqRJ71jJcZ4E0Aj319h+r2GlUh5WLEiHeqoyBQyk+wbz+vsfI4gZ3HtCWqv0fot1g8SuFh/M9Ynzd6nQGPUwFpV5eC2SH3takhgZVG4zmFmIOXhwvclR+CSdGbu2IS9UdJLCb6+QMYmoUcAQMEsQ5VBCXaPTZR3BMo87h03+M9EKmSFKJAF8DmleRZn9TsUOSz/PJp+IYGETVtfpWLK36mp06fBQJo3w5v0Vb82/9dUxATR3RH0vjfdMnhqpsRMYo+cPGCjVOhQNW3g== 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-SenderADCheck; bh=GVxApSTLytcMoGcmoba22oiC65zbg3GsVZ3A22WJNOk=; b=RPIEi6L5Vq2uJs7NOvD94547eciMNw2TwuMBh3tL0R3ZDnBU0nvJiWVgeeUen+ct6EuP4e18luihsU2cDzUAKqMhC3Za+IrqGI093F39JPURUOjxZVDJgKoAdf1dKBn+fwE0lwDOKbpH5Vzz2o2H65G4cZe9TMUqWvaQNSy2fd2lV1sYJQs7CxRvCcLFxJw6CVIUUJyMSDswYuCY6GrKPHY+nEUfE+F95YSJAjwXAtMz+G5RHHh2oj8UD0Cqmm4V4hK0p5naWxx80IsV5e0o/jiifzwplLHgcSCQteS9eZO6PtCcH/PqM4SOHlv6lMosigxk5DniXwcm44XL4DtvNQ== 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=GVxApSTLytcMoGcmoba22oiC65zbg3GsVZ3A22WJNOk=; b=KfSMZXVw0ywNHCLES0eU4XY2OmrjVOZo7rEHFu5Uu/O0QK25O4lLnRhQY1vjAdcRaK9ylRL23vyQaBFAtBz23KEXjYzsd2YDPeoWYkyztdsyDJMcmY2iLa0feRJpqibc6kaEG+evhyKar7Ubu9wt9ijQTUot1LTnL+GzsHuIVfBnOfluaA+uhxoEaRZ86clcjtoJAAMvDaI+P9NftHwLyf7UD+tt5fxxK0Oaht0lpWDD7DWx4dNjM/qJzFFzP0R+ZMljvxJ79vrvQth5YeGxow6O/+WKfid4/a1mOKD5I7bTKy+gZjHjrTohWXeCx3/vekywqdmuegetEHkoFSDovw== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::41) by HE1EUR02HT151.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::382) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:09 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:09 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B34AF9090670515324B0319866486553C24287A584D98728E6CC64338A6A1F7E; UpperCasedChecksum:2455FF9A6730032AA9A4AFA3E268AD35938ECF95E773900A8ECACE0DF10D1808; SizeAsReceived:7600; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:34 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [iqK/RIi66YIm5+X3coj9IBf+2e4oXq4dO9sNDaQKLYI=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:09 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 88ceba97-dcef-494a-6a7c-08d91123efe2 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKDSr/w16Yq9FOBxSZ3+PPFz96JuuDMNUtrlqsH755890zamiwB0p5KYbbpCTeQ+fbGRwxZACYB2bSl5aM/vqBmni3QYqGZg1zHoyXNIlw1v8uvS0zYHAgXtEYZhfZNnkaCnU3f7cVCk6mxUjAnYitrIuDCaj8PdJdJzcelYD4IBbI3HWDIpDCpuNX/WUCwrPwq+M7SdhooT8O/D6WkXlohlntP31g0OTv6W4Fkms8qm9fCkE0pCcdUU0NUPFg+5NLFcI1b1kfOV/jdlwaY9FSEJd6PFALt0yaUtjM0chLo5G0MZ9DrHjw35n/ALXbsphP4iSNj+pJv7ca3cF95bf9tbzPWoTe8cT6cq9h/3jqDcUWrXNMqYgMLaqU9rC5cnwG6FroSf1bA2FTCV/98rlhhqG9CrcGeJCTQ9mVL0sFPKfTwqhVKA7Z9hNTXyt8lH39V99fJlRVkarFYPqjr1Zn+n+Td7IW1d99pSy6xP4yuh9FPXcu54SoMWll09hUKI4yqaKBcOSqBrrd63UiKpPw5JXwK9c/x+dL3tOGfO6vT1kuC/zdCkw20MA47kE0r4eV0SS/WIG7fGTl0h5T4fmCO80tjAz/XIGig2iUwN82ws52VW0AfGXBnyhdkU9xE74npDFuNzSdqONz+ldlTZjCg/4Y955snnjjFE0khHRANez5eChnWka5DOQm0PyV9mhK/1hHLzR0szQ== X-MS-TrafficTypeDiagnostic: HE1EUR02HT151: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZzrNxdCpRwHd7ThK7e/NE59Zgk5L9eQctFGkSALTnmv0uUsmFkfkaUxzAGlr+q6bwbe9rsG6WtkHVRuzy++HMWXxIawjcvyirh//Vv4fG8iDJEKFUHx2c1iu4DoAciZUX8B7oXGBxYJWv3QdDqxub4cQ/uLlYeUPgQYKu75uqwgX7WxBFUVBCa8dOwNRrFyEoJADxiF0JOTC2ghhqJfv9DC/aXrcTA3sDPf4LWdUpIrmyKKIyLYI2UerP5dCnaEwcEd82XsjXyCqCajdm/WDsYPlOsKN4DhjGGvZyQ6HAK464SJYfIRDUBGOS5DX/YDFrzQnpWqrqbcirLz/MEvcm8nSSqMCpNM5vd+vvvRbdHzM8JeUS++ig1ai4Z3sYOiaWq3aJNSmk3pXSzQW49j9Ew== X-MS-Exchange-AntiSpam-MessageData: /u7g1q99hyqCKq1iDXWe6HETHSZTxH0OHwIrPiPBX/NG4TX03qNSMLwfcLWuIUDlHf2B1PthGVs3KNKqiTGRP4c6JuG52LnI2Ohm1u3Wn5SdM6eLReyg69LwxlvEWeBQGy7J56fae3OwvYieF69ZXg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88ceba97-dcef-494a-6a7c-08d91123efe2 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:09.8555 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT151 Subject: [FFmpeg-devel] [PATCH 07/20] avcodec/wmaenc: Check operations that can fail 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: xo4ExFbJYeOH Signed-off-by: Andreas Rheinhardt --- libavcodec/wmaenc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 2a78325298..3035668487 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -88,8 +88,11 @@ static av_cold int encode_init(AVCodecContext *avctx) return ret; /* init MDCT */ - for (i = 0; i < s->nb_block_sizes; i++) - ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 0, 1.0); + for (i = 0; i < s->nb_block_sizes; i++) { + ret = ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 0, 1.0); + if (ret < 0) + return ret; + } block_align = avctx->bit_rate * (int64_t) s->frame_len / (avctx->sample_rate * 8);