From patchwork Sat Apr 3 15:47:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26727 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3B1EA44B42C for ; Sat, 3 Apr 2021 18:47:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F4E368A9BE; Sat, 3 Apr 2021 18:47:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070054.outbound.protection.outlook.com [40.92.70.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C62ED68015C for ; Sat, 3 Apr 2021 18:47:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HEc/7TKEfJtEF4osAfHG2d1G2WKqD011dG0QgWsZAIuTZr91+wRZveTTrmYgyXzVlrDWjxD6w1JBFkdxrcZwoBmlqHrqyxVsIp6skzz4QSxUBL1HrvLlI2oDh50qF5xIErCBApJZkoYMIxoCuYPh8kmjkhgTdUSmVGn3vfzUypcQ94CY7ShV0GERd/WRl7tMaPzDmm2QFr0jndflJDi6U5b7d4rsTORf+jb3/68dtQqxf1I475n7mFbc5M5FYwz9L6mH4p8q6sYACCBbLU4Ks6xiW94DX6Ij7JC8dmed1kqqZRkuQo/bacJDddA6AcX3Iva9r9Emsoi4eV9Sa26G7A== 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=hWfCppt8Wo3y/TeSZoeWzepuGyKdqIW+0rkyEAd/YgY=; b=LYoVQKQLVazLjtwkNLZ1ROkd2AR7DIYSloIargTF4NbMb14MpeRM8DPgR1ythNwBiOGPp/R8lkC3zYMA5vDylvz0+4CTTi1qZIA7leOaUNpO98g0tATG41D7cE5kyn/JlEFSuU94s3XLsB3QOA7GY/DUSw1Q4HJ8APRy15y4dUEBHLyzv1pq5Cf8L14eobw4WTub1mGyL0VecD+TdB43YIB6I9fpJw5lwhuLV9zoMnAbSm8G0SwzwrMtyhW4YbJbOfW3m8RNSscGxb/2AHnygg9XAGvmNGlDfGXSDw6wdMEMsURjPby8xoB8u4iBoKb5GS9Yp3p0iAUbwVu+zx2ULA== 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=hWfCppt8Wo3y/TeSZoeWzepuGyKdqIW+0rkyEAd/YgY=; b=Ivy8yhZrKiRLrb5qDDVbaz2f8SYn/rEoA+JOlrws2jkG3a1ghe+mpVr5wHxqF68UQxWqUNs91hCSqmajGg9ZmmiedBUue8HWO9pOXG+oYxzEWa2erI3hnyQf62uyGYZW8vDnFoSAAK2cymWKEzI0GFRVBiLAy63SDlje84G2SRAXqkuquQ1ElF56h/W/8kNMiCf2gBqo9X+OUdr+M8Hg/iNUrSf0SmUamh77XMWT9FRun8dPeuc0Jm1haJYI/5RSGj3oFHL/oIv1TIRjqYTC6y+cLUb0m4gWr01ade5m/Km1RUbMslaHrxCv9Ux+8rZn9JUToBeZU5juU99lImhauw== Received: from VE1EUR03FT019.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e09::4b) by VE1EUR03HT025.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e09::376) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.29; Sat, 3 Apr 2021 15:47:30 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e09::41) by VE1EUR03FT019.mail.protection.outlook.com (2a01:111:e400:7e09::153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.29 via Frontend Transport; Sat, 3 Apr 2021 15:47:30 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:D589600AB33BAC8AFAD3862348DDE5C10228F7A2745039411A1E3DC16CF3C341; UpperCasedChecksum:9700789F15FBA69C9EBE8771F564326FDFA4BB8DB511EC7D46954B80303077C7; SizeAsReceived:7385; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.032; Sat, 3 Apr 2021 15:47:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Apr 2021 17:47:21 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [V2oyFvacVIbVXjJLb8VlL3WFFmaRUROH] X-ClientProxiedBy: AM0PR10CA0066.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:15::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210403154721.3452705-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR10CA0066.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:15::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.26 via Frontend Transport; Sat, 3 Apr 2021 15:47:29 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 005ee9af-b972-41ee-b6be-08d8f6b7c99f X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIBMu+NxyApyG92+O81dLoBPgoxvBEuqs11Dc05yAX5lP4PiAPH13TgYI8bh+YdQWBse976Eo/XSGKDOzqJcRm7WlIZR54z27LLi2gczTUxSrduYD3rO1oViF8WMSO7YaOAR8PgQROWK/VZ8i9HYdOZiklRL2l3tpYHy62M3rirc45LXoTkWjZ39XWQ5jo4MHaJChLQk+f/4KtsRkBJ8z/5dNdIH5cnUGeklVCLug8LginhWeqbhFMWXfft0fumcJyHOZwacmQV2fOwg6gNvHFAK1sQq73fQvruZuwkrScf20CXw2eeymK/RlyzFtc+RDzy3nINUXsm2wkB3ARVlOoRhLXI+4iTi4N6/eH7bzC/2fm7+LHXhEQWMDGgsOYWfMh74Xns4gI3Mrq9lLIBncr2bqPxtcpLDCldteZyMUYMXd0tW57dyYG8bWzMAVjEj++KLei3JtgF9cRITWqK5dUjoUMY/poMCmXrfQIyKwn+4TQfWGyPQcybdl+3Dl/1kMod4pyefwdmc+YccXYn4jN6cfdNC9yboY1rHieIEB+wQA6H5yBngRZ67RNdWVTpuYD5v5rKPb8/96S4weYKEt8iQREweO1DdckvGjPqaywZa/b7GVffrzFpU2P76YcZmZ4/meKWJQwEVCqBz0LQ+D/U0sLzF3pdyWgP3cX1GTpiTX2JDGqVKSes7sALE29I9KcI3EwFAz4kSg== X-MS-TrafficTypeDiagnostic: VE1EUR03HT025: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b7OE4jpVlpIchPOl0wztlfkWXA3cbNR3EKhAPPl/FBZ3M1igvh7Z01lE7vdJs3oFs/QEZZu9vWOX7NEUw5LHKS+Z0bwTtQcECbHb5wlriNhdn2rkkDRmyTLtNdtg5BIzT2uGKsa1GUQnDAIBbSYTvk2qabdyHDK+G4+DCoQrMSte2CiKYnOrVFPuAPthgGuuF1HBbV4S169PMDadunVe7kttoM/1lRp/orZ9JkTdl6+hB6r56Bb3MfGU6mKj+Zy2JyZLPsA6MmhZ3Jt7TmQJi7qUvN3+iGqVY2nffO/OrtY1KvStfxh607SZ9ZDqpdM+dBzhw9bk952iasvYynx9mw3t2AJkOkN7ste4iIv2vkaZTV8A2vB80UQlKWLP6bCGKSj9fNd/XA1AdruV36o/Gw== X-MS-Exchange-AntiSpam-MessageData: dz5qCQXiP3lUt05K93Nas15KK9vwKgnBzLmffQDdYY19yXTB03IH6uCAaWeyn1wWxQswpn2fSYACqXWrbMAia3fmM3Ag9XPlhPbYlie+w1rjNOO3bbHstq8R/IfNftfk7tSamLt1E/cpWGtef0wdMQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 005ee9af-b972-41ee-b6be-08d8f6b7c99f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2021 15:47:29.6809 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT019.eop-EUR03.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: VE1EUR03HT025 Subject: [FFmpeg-devel] [PATCH] avcodec/wmavoice: Check operations that can fail X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" There might be segfaults on failure. Signed-off-by: Andreas Rheinhardt --- libavcodec/wmavoice.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index e76807faa5..2cb4219b84 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -367,7 +367,7 @@ static av_cold void wmavoice_flush(AVCodecContext *ctx) static av_cold int wmavoice_decode_init(AVCodecContext *ctx) { static AVOnce init_static_once = AV_ONCE_INIT; - int n, flags, pitch_range, lsp16_flag; + int n, flags, pitch_range, lsp16_flag, ret; WMAVoiceContext *s = ctx->priv_data; ff_thread_once(&init_static_once, wmavoice_init_static_data); @@ -395,10 +395,11 @@ static av_cold int wmavoice_decode_init(AVCodecContext *ctx) s->spillover_bitsize = 3 + av_ceil_log2(ctx->block_align); s->do_apf = flags & 0x1; if (s->do_apf) { - ff_rdft_init(&s->rdft, 7, DFT_R2C); - ff_rdft_init(&s->irdft, 7, IDFT_C2R); - ff_dct_init(&s->dct, 6, DCT_I); - ff_dct_init(&s->dst, 6, DST_I); + if ((ret = ff_rdft_init(&s->rdft, 7, DFT_R2C)) < 0 || + (ret = ff_rdft_init(&s->irdft, 7, IDFT_C2R)) < 0 || + (ret = ff_dct_init (&s->dct, 6, DCT_I)) < 0 || + (ret = ff_dct_init (&s->dst, 6, DST_I)) < 0) + return ret; ff_sine_window_init(s->cos, 256); memcpy(&s->sin[255], s->cos, 256 * sizeof(s->cos[0]));