From patchwork Sat Feb 12 06:41:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34246 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3855606nkb; Fri, 11 Feb 2022 22:42:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJxg3CKs6xCfpW8KkYMSOZ+8AHhFbxKI4WyqT0jdt4Y+Yx7bux5OUSxwAu/ceyljaP8ID7iR X-Received: by 2002:a17:906:94d0:: with SMTP id d16mr3920711ejy.412.1644648160143; Fri, 11 Feb 2022 22:42:40 -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 qf26si12882399ejc.150.2022.02.11.22.42.39; Fri, 11 Feb 2022 22:42:40 -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=qVtSolzb; 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 CB67B68B26F; Sat, 12 Feb 2022 08:42:05 +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-oln040092074018.outbound.protection.outlook.com [40.92.74.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B39DE68B1BA for ; Sat, 12 Feb 2022 08:42:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WhESZWUShXI1RB8pSyIz+p1jk85IHpWCZrOPf+CufM1bJ9afaY+1hyGxNBk87F5zs4DqlJtH+oXkPSPVJnvHVaICuhi2kKA7zz4qRWui0xs2ymkL0AtiRMxsSq9kXQRTNzJ1WPpUCGFWftogov7TYW4Vl3bZKDxX/Xv0+ef6rFZlxZe0gBHF+76t4LPyG2tRz6Xr9XuhMLtW1M3VYZzYOBvpjDhPxEjXmzEOQl1tVl8IqiJMOc+mEfdHhQYNR5a7EEB2qtHgf0VedCNHrP/HNqxJQBXuT7d5ba4ff50BzL9adJUF45B0rOV6hvU/EOJkonGCOsO2/jkxdtl6DoJHVw== 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=1cdPnPuNICvuyTct9iYeDPMztw40aiFcpdOSXekYV2M=; b=TZfDc9FBkBlfg6WNx4sTzXWnLthSwBDp0sS7ynybHsFDZeoNbTumq15FjOBLBMjI9gqrDQvs5syRSY3azz4wp0EOmAZglj0efVQw3RYOKF24Pqr0r0Z83mrXIUjjo+cUenrax8fVC1GvKhZXCMZwBRQjawtkt8Htro8Any0OYZZrtv/MZNcvXmVudTz7jCTU9Yg/dcshFvCUK2JxChrKvRRoAr4gM/4Lc9Y97DG3BO1PCHBdmDeGt1TT36v7L02TX3FuFxHWX8lKE7+AbS8+hEDCGmAiOpDscGhCmN5xYqqyL7uosnZRXqPisG7CK5CQeoVQqZkGAuGXgzkvJnq/+A== 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=1cdPnPuNICvuyTct9iYeDPMztw40aiFcpdOSXekYV2M=; b=qVtSolzbxVq4EPdylXy7OQ821PK7Bi8Wjky6Q+INCkltpGytMvrFK1fqCrpiJiUETf3zMCpMaEabFwrvYAuRxJ1oBSx2QRsHy3k+7RYSC1c1r6GkbRrK70ETDAD49LxSlI4Bj2VWVI9eXlnwBKQ0FrgGu17/L5eBPC+8erMILI6O9+MzYAlLgnZ4TDsIaW3a9xuM+k1eSXpZE4TUHTfe7H6EVjt7YchHp6U/AOCMQdf0blThjhuASCUZnYR3gxk9TxqPUmBJOja7+YZGJCvh/Te8Ri46/uGphEi8Ke9NhbPQ8v4ZgayErPWf80P32S94TCMxW2vbeYxJsLU6PjYQXQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM9PR03MB6723.eurprd03.prod.outlook.com (2603:10a6:20b:2d8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Sat, 12 Feb 2022 06:41:51 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.011; Sat, 12 Feb 2022 06:41:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Feb 2022 07:41:23 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [ffUWTzd6Jk+dQyyDF/UPRlAZXe6WRCl1] X-ClientProxiedBy: AM7PR03CA0008.eurprd03.prod.outlook.com (2603:10a6:20b:130::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220212064131.2265452-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d4445b7-470d-47b5-9657-08d9edf2c047 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUp0/JksszMwZGXS7aFQs58cZ2DTdgfYpkvTUMvhVO90/T8K6dMd771ipcOD/ubPm6FQvIs4LBWF9G0nwK1qB5HU0+COLU0OvbwEKb7BwvN8gRuPoDtFwzIgqtF1atuYnz0R1LqujnskdFQih9mjF+jBUvdDCRuvouMUqKNtyXCrFfY7NQOtxY6DDMPprXPoRtV9y0jCrcBlcjpXQFUYrSXQE3Z82ykrMOHVrJNHffXb5fNjxM/DBhwmao3sCLAZW2MH1wmAXAS6i1HJiL6K623b50DELhackEK8rYTSRy2geVTv8fYkyHSvGkCzGINa6Flzmh94JJigclfVT3vDrd2fnU048Z3TE7MfFDr2+tWa8kP0eqMtA5JyRnFrXsfNVAMZGI0sf/gWHedZjf/AYHhVLJZqiVX7wrwkfiEhPiKtYH0zMZ0e88ZUdTQNutSUBNrYNRpL93OTZCSjqqyQjdifKFLokkv3OkYsAdQdVvvyv0wBHRiSo9e8E9LGHETzN3Ss4iDVFFSHWVUeqhdmsb/fRid388SprfH7kCljmBeuQvtIDELe/o1QEtMzPoYhRAL4zdkzAQtOszG4wq5CExdrAH0fQGVwr2VyBB44o59e/SWpKo+TGAhCWzev4jpdwGHIVyHmc2QD7Y1/vTMS40Y7pMafA2aAeQ+eMyE2kIMwDFZocw+ULOM69SZPC5OjogGowLJACpAXtn7JM8Pb9YF1fOTR/ozqXY= X-MS-TrafficTypeDiagnostic: AM9PR03MB6723:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J3keiM4JacOBFSeMvlCr2bNsau1hmCfbKzMB5bz5Eu3VbYu0gX1dVzbSof9iTMYelvyKsEYVJtgErCHO7QtJrqEdhru6HAM8c5k/2nyN48n5tzXrstMEW0VMj5QuuC23GrQYSWsBH3SMYVsKGIRGmGfLgXApyLQzoOADie2U0yX0xJ/3+Hyzm6UqlgIREj+jwA06aNKoWA/T+vzGHS/Q/WAdz65CB4InaOIpzTh8jSCtDqmcp0SRsAKdGuUwMplulTSSCq1YThWXWnogUw2uTQQGu+LBdOx+bbH2Qt3W6R9ePOXksmCl7odt4kA4A67GoEVZlpLOTy/xyHio/4Tp8HhUmWQ3WLRIKXYgnhdasT0Vpd5Q8/5PMm74zKlmWmfHpYgLWOmr6O70YS1+9FoYdcgGKA4u8VEybB1O7NAqNlOmnVVebU15FNAi3NMxbiRqsoJdt+oGR8dkYnk/jGqZxu/BfPbWrYKqLUVZ5hE3e5XY3NtxEFy9stmoxhX+l1HUqg4GCG3CcEgzWAciWlQYSUAufzltrmiklrctvu6Tm1bKjvghr13TA9VQaLQ5eP4CVU/xSarYnWiGb7Aw0Iz4+A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tj9/VSU8QDU2wpjioZQU0hK34FgcAv4FqqjCY4wEzNbC5iIPfw9HcaRFi9vkzAcqL5SrEO9ftmT2obbd/oStgpwq9obHNm/bYsPlUVvZsfT5lew/eUJ6Qrzc1/DYA9CtQQv7FJKk40aaDDFHzsuZcUkzW1+QeOXiLlBku8JKH5Q4MVExhzFUmuSMfePAAaKmoABv55C4bwJQd9UddBAlMlNixywJgj4l+RDNnSFf3ZR4gSAnb/598mHfD5UWWHlUGBMwCGwvj1Tw/cH4t0SBaFEREakhDfLtygEDCeOSpUzyyzsCPMAU8pOArnQXLzXqQ4bV3iJnEcFjuPNrujattLJ+PT1vJ/kAapBa7xTF3yO/tftO9evWlJC8jebjUtMo8n0SL5+feAznZP8xPhikVxeqfwE1x+/7RV+S3VOIJ12dQPVTcsMya5v2szUOH6Po+WiL2j/QXjjnDjPZs+9xcrSVsJh/nHkT0lfk19LGA6lGk/cNwPalf2HVRGJSLvdh8GmGbvb8DzdQnwb+zE4WcZ8XyifKIZPy1yD+6/7Yc3cz9ixucJ/abQg02InFlNGXDqW+dpCgIU5hDYoMoG98UfxoYBQx4B3Vpuxr5NbuZEeRkmDwbCYL0n/R4TVHCfuDJZGOQbpibmDicbyrsWOEXe8uFsJom31P70zv2SRnoego8rpIjnkQ576k7l4H3pPN/hLoHM9H61zMYZ57umjJ8DlF68IH5tETiCaBGSdPIvgB8u+EcJoeMsmL87eyFs0TYYImrqT5toCgorKoURCkjH2FhVSJLA8L5CL2c/vwiZPLLXw/Oud+9VgpzRBUKZgKxHY10kyBPbAvlbejVNdNfnNEolBooul7dhA61B1rSp+0h2I/U2Q2FojRplZ04qYOyJH/C7kKPmyksnlzxojQJAAm//2HMp249ONwmB3WSljsBMk2y5m/rZfrlDFGqo0XHlzwN00aMAV8CnM3GivMVA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d4445b7-470d-47b5-9657-08d9edf2c047 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2022 06:41:51.4983 (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: AM9PR03MB6723 Subject: [FFmpeg-devel] [PATCH 09/17] avcodec/alsdec, mlz: Check allocation 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: EzXqdoDvC2yv Signed-off-by: Andreas Rheinhardt --- libavcodec/alsdec.c | 4 +++- libavcodec/mlz.c | 7 ++++++- libavcodec/mlz.h | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index c09401d257..029c37e99c 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -2111,7 +2111,9 @@ static av_cold int decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } - ff_mlz_init_dict(avctx, ctx->mlz); + ret = ff_mlz_init_dict(avctx, ctx->mlz); + if (ret < 0) + return ret; ff_mlz_flush_dict(ctx->mlz); for (c = 0; c < avctx->channels; ++c) { diff --git a/libavcodec/mlz.c b/libavcodec/mlz.c index dbeb7dcad9..9087ffd8f0 100644 --- a/libavcodec/mlz.c +++ b/libavcodec/mlz.c @@ -20,8 +20,11 @@ #include "mlz.h" -av_cold void ff_mlz_init_dict(void* context, MLZ *mlz) { +av_cold int ff_mlz_init_dict(void *context, MLZ *mlz) +{ mlz->dict = av_mallocz(TABLE_SIZE * sizeof(*mlz->dict)); + if (!mlz->dict) + return AVERROR(ENOMEM); mlz->flush_code = FLUSH_CODE; mlz->current_dic_index_max = DIC_INDEX_INIT; @@ -30,6 +33,8 @@ av_cold void ff_mlz_init_dict(void* context, MLZ *mlz) { mlz->next_code = FIRST_CODE; mlz->freeze_flag = 0; mlz->context = context; + + return 0; } av_cold void ff_mlz_flush_dict(MLZ *mlz) { diff --git a/libavcodec/mlz.h b/libavcodec/mlz.h index c3df52c9b4..24993126ca 100644 --- a/libavcodec/mlz.h +++ b/libavcodec/mlz.h @@ -57,7 +57,7 @@ typedef struct MLZ { /** Initialize the dictionary */ -void ff_mlz_init_dict(void* context, MLZ *mlz); +int ff_mlz_init_dict(void *context, MLZ *mlz); /** Flush the dictionary */