From patchwork Fri May 7 06:46:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27645 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273208iof; Thu, 6 May 2021 23:47:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyyHjkwPRC8eZty9tfQBi7onfcYkIE001kpxxUVMJQT0CboBkcjTdtEvNeCcab7znsIy/F X-Received: by 2002:a17:906:170f:: with SMTP id c15mr8294709eje.358.1620370035341; Thu, 06 May 2021 23:47:15 -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 m3si4408169edc.293.2021.05.06.23.47.14; Thu, 06 May 2021 23:47:15 -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=MBEznBZE; 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 75B2E680839; Fri, 7 May 2021 09:47:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068073.outbound.protection.outlook.com [40.92.68.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E92AC680802 for ; Fri, 7 May 2021 09:46:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bGhGH7jx0MC1ceOP4+Qy59zD2GZWePjov3a762pw15kU9aDJuLxZr1yzkmDgqnpPGe92MzKv4xMPuOpulox6tC/cat3ktfeegVJ8+k9DuzetO0szYNSkdLHmRTo40HPpvcMccDHRE2dQ9FR8RdA1vCM+lGJ7+rk9a8kSYkl3GS1pDsquTiGyQ2A1/7IDkV88+C4giULBBVzn0tjgG4qjP9VI+/pJ9sSz6lc5g+GXO5gUZPYdiPZyQWOZwXVt/c0/ueoy80LKr7ySCiDbYhQG1xTI3yXquDEWAn4TZWsve6b2YpZJZvk9FJ8/oFYtrKocu7Wro6+G/+eT9A4MmZyeGg== 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=mx9vagOX4vH0PBSJTiQBAx/QTS67rqjKEfYAg4+Yd7g=; b=PWvr/NLC8HOqgESLhpMOwNC69ooydXHr3aUHmaqYi1b4FpbC0i8kp0ElfgYKyUlNNbZBUh/FqhpBVKkeG2Y1pLAUeVIefoOBbOrE0Nyx7zzahMbdjV9KEclWPwY3NDUqA2oSbyhLBTSiN9mDDpLbAG63SufD4gEDIue7NqbJnC6lRKVtn8tzhXdG16NkkYRJCAIJB4nK3BR7gBloLPshIlxzvELsq7hBfiMEfa0oNCNxR+D8ttrbz5HEOWx3V1VMw4FGFy/AnSciiJ1sJDeu3+hdCfG3/W+U8ioTI4Y6mmKU8IifYa/WwUFqvJmtwAGq7YSutFQQwb/Dt4uQTlRdcw== 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=mx9vagOX4vH0PBSJTiQBAx/QTS67rqjKEfYAg4+Yd7g=; b=MBEznBZEP2ZESBlsZt8qirOSuKDJFCB0oc0LFNi/rnGFCZRRS5gLjEcdyBhZSFpDaswaEACR45ISOFruBgOMxNhQrOrHhmA/xk/lR9KbMqdFel1miqv+2LFHjpxfY4LXcAHGwJXSaEJmqiKqoSDlobOjsieWm4Mcuf3Mszgkjw9z8dc56kToXkLZADl4H8wKZWxFALi1wBakCWlZ3arWC3Lc3fkv5fIYb47NZqJZRxdanrrOcrE7FOpwpP/ON3w40UsnBSG8x/n2983BIhhxd4A5EQcxYzdW9qkAac9P8JmElJ7b9sqhu7WvWys68zJoy8tsD81dgRVKJVFry3pSLA== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::53) by HE1EUR02HT006.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::128) 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:46:58 +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:46:58 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:DB877D7805F69CE71756140262451C7195B33848B7FA2A60C75B39563258DB9A; UpperCasedChecksum:C3523F6968D9955D0068CDFAFCD485CCD238AAD3B2E6384E73A193A708B34B33; SizeAsReceived:7589; 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:46:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:30 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [nPMb4SIMy0CPX97fQfWdf1Gg2HvgF+rIwEL4e+1J6xA=] 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-2-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:46:58 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 4ad82384-fd78-429f-7997-08d91123e941 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKDSr/w16Yq9FOBxSZ3+PPF6QekWiAaCqbmrjvzNgwcIsj32yEppnNDUwOXPDrQwPcZUjbU7mjOwkkpTb2u+/KM7CQ1BRwFa9WTSr3Dp1L1yH5np0RAvMN2blu31XWaZKgo0hLTl7Dmzd+31rOFO/iVfQ21Z7ozv4ZYG/UwWfdXgIydKVonfjmUinMgr4Xm4jsueZAd+Dm/qqlBYofqZseVp0+oQfRMG6WFAgdeIgVuwYWHG1GqCcd64HGUlGpuPtbVzShH/wCUIe3Q40hi1rbLTHcHDy5QCce0tIeJGlgNTwFlcF4e641MCC8Z6QfM9HO8kHJfr1bnUyqEaC2PX19Uc/EnVmXUjoP3iyIy3bSV4FGAU1e9mn0njPWDXK+cSACBly7AGSou1PYgL5kUHIQM562NROyDt4+YlKoUoTngvEoV0vWG9I3OwivD8uB88+LVdGT+gAPb5ZdHj73YppwNLzgG5syLt0Hiu/FFmfdyFoaY3X8xcIMoqDMeF/LjiE90jMNNmR4mFwCn4OsZQUzJOCGgvnEJdIfqpLmY4NbamqKmUxOJMHrvj1KtN1MYgaRjRsXPPvq3ffRXyVWSqEXg+/4EnEcI6mWwMSP4WpD572/lDrbAeOXr6NjotLPi/pJqpxKpkgFGM+vcnSAloRNBuLLte6djLxxH/k5SARiuauPeultrWWE906ZjdJbT9E6JmK0fDj4cPQ== X-MS-TrafficTypeDiagnostic: HE1EUR02HT006: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JUt5kGnG5ZDnTTtDKa+6CXkuN2o1wqoxT3wcYLg5nN+jg+ahlqgBe6+jT1rIl/wl6MYC1z1dIfeEONLv03550Y7H4YFsF4VWjmqx8CWbXpDSsUZwmWZdj/B/X4wUYG+zwo0jyvLvBgisRr7gBakg5VuqURVTkNknLF9SJKWc9qrNoBD+M3YYlmCPyJH53psyYvhlvRzM5pHQ7MmYzLfxKoQbJmWhbtg8mACW9wdUOfNeZLgORBilh/AuwDd8j7wpJUq1oC1z1B8qZTsXWjembuk1rCswkXfAyLyBADRSU4vkEZkUeb+7s5Phl3aKYhaqBvb09csAcWzuEjNTsUFT/tbZbje5/EzHKPEFg+JM2ynP5RHqgfabhQshWQK1txcFTreAO+B8/iTVNrJaFCvXQQ== X-MS-Exchange-AntiSpam-MessageData: FijwOxzOBDwbo9F95JAnO2ih7RRxuO0ioTLl6mYtMTSM81EyZZ3QtpditxXU7pXk+wHP2XH22UL1f9gp+NlULYlbzaw8DmusgeZzZlC4MuVNul7Hudr5beOiemXZ4agJkUMSpJ80ZQVklePPrSwpTQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ad82384-fd78-429f-7997-08d91123e941 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:46:58.8383 (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: HE1EUR02HT006 Subject: [FFmpeg-devel] [PATCH 03/20] avcodec/wma: Check initializing VLC 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: y6VcXvsK3VjV Initializing a VLC entails implicit allocations which may fail. Signed-off-by: Andreas Rheinhardt --- libavcodec/wma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/wma.c b/libavcodec/wma.c index ee04ef725f..004ffb5515 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -41,9 +41,11 @@ static av_cold int init_coef_vlc(VLC *vlc, uint16_t **prun_table, const uint16_t *levels_table = vlc_table->levels; uint16_t *run_table, *int_table; float *flevel_table; - int i, l, j, k, level; + int i, l, j, k, level, ret; - init_vlc(vlc, VLCBITS, n, table_bits, 1, 1, table_codes, 4, 4, 0); + ret = init_vlc(vlc, VLCBITS, n, table_bits, 1, 1, table_codes, 4, 4, 0); + if (ret < 0) + return ret; run_table = av_malloc_array(n, sizeof(uint16_t)); flevel_table = av_malloc_array(n, sizeof(*flevel_table));