From patchwork Tue Feb 8 09:41:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34163 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp641684iov; Tue, 8 Feb 2022 01:41:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJzFjB6zWnum5Q1p+ZNK8HbNLCty5QPGD5dh/XECbWmXS9Ta0yd/sYIckNIp3pz26K2z2ibE X-Received: by 2002:a17:907:16a8:: with SMTP id hc40mr2906011ejc.739.1644313286352; Tue, 08 Feb 2022 01:41:26 -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 24si7848199ejg.607.2022.02.08.01.41.25; Tue, 08 Feb 2022 01:41:26 -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=sL3d2sgL; 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 39D9968B219; Tue, 8 Feb 2022 11:41:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075072.outbound.protection.outlook.com [40.92.75.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49F7868AF36 for ; Tue, 8 Feb 2022 11:41:16 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nTXavbwdI/pIFNdxA/b3sS8E6MzijPPEeXISUymMZRIAKWOECuomcKVB0X8ihNcpnt+6YHEsDs3mjFhtVu818E0DGGEXxCRjLLZ9DyeDESzh99wFEJCY9tR1GJEX+ESGqqaScyu1+zZ9GT3gRaa4cNOCAPylNGLy811FAGxTp0BABJPBXidI0CcCGWpGvUcWm9CINEIxOo+cZ96/YlT3E9pgzY8ojOFl/gZtK3VUSIkOPLmXYkANwEAaJSA7NkpIqx3hgfwl/7sIcItWYOaVBCH9eptiAlIWMEMs/g4PHQ/lRBBXK6f+j1Df8H2V9vBWMPejigk95FuwqSiarVlsYg== 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=pGSWEWCfa0SDnY1dxWG6f5I6UvtlkTui9uenocZ/0uY=; b=SseGV/csghISLDY0bKSxFPXqpYS54MEZ3gGY7NnaQhwMoa6FseTHP1u6FRJaUXe3aZ0DJVR8S+LhwLjy60P1FMqnJ9EAmvXAEAxyYwH9pqb2GpkNvgD9WePYrGIYKnlP5Tshr9ONrsmdFUpnK88c29KzQcE6gVFdMXon8kP44yo9dXYzgJ+NGmKcAscN0QWTh2lRCgmKF6GcxVjmg84RP0rxZ4KO5EzXDw/2FyVszFH6OonXvUpllDWHvVdsCQ9m2/8tcirhyeRDBOG8IcjC4PhgqKbfiQp6sLGfSRjclJ3V/fRRrxVoYiRa9euQY8IoC3KSKotfln4qDVH0ARLNow== 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=pGSWEWCfa0SDnY1dxWG6f5I6UvtlkTui9uenocZ/0uY=; b=sL3d2sgLcXpgNMfJ4C7WYtNOFFEncANBISTaaHwULtTjVUQwdsUNj8RFFQl8k0oXHa/v86+lfVbnJ8eOTSH00OU2ZR6VjjT34klRzEsDuZ04oyT2RhYTRLv6HJKU0+o0utPmicKbHUOsFS+u0vKByKp5JobNFyE7mVjnZWpFXE6pmIJtFaCsH7sf34AQH9AAVt+gVdIEIgF9kAGew5XXVpjYEmC5lYrKGv33f1eg/NEHrPSRf77YW/zgMk9H2upP++PKTDxEiM35mAaCo4/PfXyn1UUX8dN9kyE4nQKY0eO7z4cXdrdTqdDeV/8z72rr8o0mtBb1y0BfQlogbWGfPg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VE1PR03MB5774.eurprd03.prod.outlook.com (2603:10a6:803:129::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Tue, 8 Feb 2022 09:41:14 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.019; Tue, 8 Feb 2022 09:41:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 10:41:06 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [J0bW9pNT/wJtNus3JespUyAK4NWjQFXG] X-ClientProxiedBy: AM6PR0502CA0070.eurprd05.prod.outlook.com (2603:10a6:20b:56::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208094106.1062474-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd0f6065-f152-481c-7613-08d9eae725de X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlQohqaUcoxYjP7DRPDYie75qn7mavc+lbOpFoHWJoPwYUCjRscP2OrvJTJQvaXpM/l+oXT96IgDUa9T9yozZQBBNmViZWWIDE7fcTcUWXRomLPkFCT23d0yaycdHF/S0/Q+3AwNAY4HcZEJbvG7wjmRl6v0EbUo3RTSLBjQUzuR05emC0OzbRZIocc5HhceS+TxS6rQAGtUkCntjdjdJpMHLlS3XK4EM8O3tqGOsOZ1xX5EpMtkuq9ojwZ36hkPJx2b3YliK3hTCcMIWJMCwAn5VlqlcLU0uY4JaZjkiJrEWQf99/EsGTGJlLp8Y9UPujcltURfCHTQPuSzIRorQYpK7NovyZXfqHGU8nBXeN7JbEgOWpjnr6crks0DIoyRnJKfG8/BCUrAndwAoCTR4A4Jf/FMQIvzSH0XZm96rTVP5PPhfFeK+wLPgCUJUGRoKAvhzRBB3XruEg7fBLM32aCKiWgTd7PGzPwKH0k7jLOdDddKbJVhzx34SJXXnPBy1dxQVj3QF2PTAaW1aNfEuyI61uyedhlMsgcvAe26BXztP5WJT89dji1da5o2PiZEUjqbnYFeth2zFlurwR5KQE54E0WTu8los53cyVWl4DPCTXF0DNENx10OqUYhofPFHHRJaNtXugLgQWAmGDliwfhl9kJQDao93fMqspMRG3UNQREzZhaWEaLy+TkJKv1GOnfrOGS1F843u2kcvuuGk8PK5DYIQLP2pbojfvaez5+NNd63tEpYfY7o= X-MS-TrafficTypeDiagnostic: VE1PR03MB5774:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cFdRolPmfqxWPRhZ7jjup/aWnDxZCn4DVDOguYJKtbocM/ovvJAtV37lYrf5MjLH1QiuFkehfkinmJBNLg1rjrc64jOZXgrsydtZePtGSD0a5G419P/uDhnMGDWjNeLaW2VQIrflV1p/7OhwWesurqzdPsBETV1hnnR+12GRRTiA7NPWE6bM1WtUSYmN3lct3xH/sSFoZIfTaM/VyqLIRJCovJ20TU2oUm/5r0SiwTqidy6FNuI4YGw9Vc8SsYQ41SQoQeBaXG5FC94+aufTCk9CU+u4A+QMi63JrFftdS9zODEQZT7pCb4n/8pprCiLn/e0r0zV8ViL7Tio3akpuf2pBo3QYNkmRiIcCpOUIJvgbVjfo6aAAXlXzgz8qVRWd6DCvrrDJfwRToNIJkFCw31ttQrEwmAVOMC2dpJ6BbNL0D2KI4os+1frm/OrxFx49u3IuUX5OQadL7srEe9G11IVz4eIMcoAu8bQ9HbEavZ+VELTChXB4/bu1eYDKlHy+ZLVxFiLMtO9bR2wMKbOKW+zHebMBoq4iqdrIXiTM2YygrIogpWYu5FI3vKV6F8SsEA361RymvxvzP0nqCPmWw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1qZJkA/Rpipe0+ZRWkFKzASP6PnczC6miNj97k35tJdxODx0Duw2AYu6IN+WwDEYIX4HYi+9uqeiitMk8cCUCF9wc/AZ70vC5HUjMY435xLKpS26JJda/EPwu2Xf6E2k14iS+tSaWaJ8Ek7gs2RXD7LdvoFkqcbb7RsHU2xicmHiWXaOu9gPufmqS/E82fMo5xsfTAWtmi0Bjaip6n7pcdmQ9QApFMrbrYIkQIVT1Wv/DVxSfWtDY4QloXRYWIX1hZpl7RRsLR4G/tSaUeQVajRiik1ZRKrUyjfBzUwwyUozHSHEAXKff8Bp/CUUycvhnu11M7293CnMdVmOk9GC098Zk5vNjARVZVwxr67Odc3oNEuDlfdPq7EDmhNCcqlVtaseZLb5T9gwtyMTxfpvvKWAwbybwUU56WRPEov50hq9wB7ppqifrowWtU7Bul5feGxwaO1M7YpfT7ENlQ8zVyVTZMNrqcUqc2RFIS+O9qJyNAc7qpfjl8vCMZr8AKLg0QPy/42fCy1d1XMcnZI6nbt7IirCD8KUzO7r6v5Qp+lopwjzrFqHfMvT2XW3ISP+H4UerPJYQ4+d4Or5XiaJ16LrHYJVEEiDrirmG5uFruEIUCQ7yoURmxHlGjYgrTQdOuSv7eebfy6crCIyniA++iFLNqEHX113A4r09dHZZRrDLt4zwypr0uFEa1gaCDHfPeWUSWmr1+q75Np1LprVb0HR3Y7NLg4Zpc7dDIV+8eSybWOvrT0Sum1notw+9AmV0ed34ZAxW8E3XpKV1AFm8EQ7ykalZWacquc0a2+gBidoAXv1U/KapHyFp6mpbDFVcoiZI9rFOSMsxmJq0NPLknHOmPkjt+b8CE3wX+wyJDASKC8U4Dg57QgP9hzeyLL+yujDKqEn6rM3q0GwpiyRg99WQIFfr3FK4o3npHlEvMTnoLn3X9SJ58ws7tyjbwrD+uogo1r+OsOtlKMt4NLVEA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd0f6065-f152-481c-7613-08d9eae725de X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 09:41:14.8172 (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: VE1PR03MB5774 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_jpeg: Fix size of huffman symbol table array 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: gHEHXG6Q0gPu L[i] can be in the range of 0-255, see table B.5 of ITU T.81. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_jpeg.h | 2 +- libavcodec/cbs_jpeg_syntax_template.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/cbs_jpeg.h b/libavcodec/cbs_jpeg.h index 6305f0ee86..9dbebd259f 100644 --- a/libavcodec/cbs_jpeg.h +++ b/libavcodec/cbs_jpeg.h @@ -99,7 +99,7 @@ typedef struct JPEGRawHuffmanTable { uint8_t Tc; uint8_t Th; uint8_t L[16]; - uint8_t V[224]; + uint8_t V[256]; } JPEGRawHuffmanTable; typedef struct JPEGRawHuffmanTableSpecification { diff --git a/libavcodec/cbs_jpeg_syntax_template.c b/libavcodec/cbs_jpeg_syntax_template.c index 6eda56d623..e06abdc674 100644 --- a/libavcodec/cbs_jpeg_syntax_template.c +++ b/libavcodec/cbs_jpeg_syntax_template.c @@ -84,12 +84,12 @@ static int FUNC(huffman_table)(CodedBitstreamContext *ctx, RWContext *rw, u(4, Th, 0, 3); for (i = 0; i < 16; i++) - us(8, L[i], i, 0, 224); + us(8, L[i], i, 0, 255); ij = 0; for (i = 0; i < 16; i++) { for (j = 0; j < current->L[i]; j++) { - if (ij >= 224) + if (ij >= FF_ARRAY_ELEMS(current->V)) return AVERROR_INVALIDDATA; us(8, V[ij], ij, 0, 255); ++ij;