From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 751B740F68 for ; Fri, 11 Feb 2022 09:28:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB3D868B291; Fri, 11 Feb 2022 11:28:12 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2061.outbound.protection.outlook.com [40.92.91.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 029D0680134 for ; Fri, 11 Feb 2022 11:28:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lj+MyaY8Q7xK5ypwEbpXUhU9A/80W9X/r2Z12i8njrUTIgObgQ4AqspQDOhUuGkMXcPNrXhW4eho/ZGwDR2WrCLefgJ8M4O1A/JkWOh8/8x7s9b+sySZMSz7506hPcJ4thkpha4Temx0tCdxMOwNhLzqkL+3gWEipjyBlRGsLoyxkUDi6XtWIFPLlSlUzeXxvZwEf0vDLrg5oCfkAW8jF41kYstSDGQK6/Dd4vfsLP2ZtFd1EZhTs7tpgX8+4PGghvFT+MKYc7z+x7IF8GCCzVThi4Os0vx/mMwWZOwhUdM4H75BlAw3Q7aoNTdrc1jCkfKDFYdX+GomnThBVk4qgA== 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=mlMKgQyYN2/HcROsqR8POfXC2T88xWjz3fpXoQGDg2M=; b=msctfCEP7dhS91o4Sn6Up9uGzkOW3YpbO9cMKezpK9ZKdDGwhjzfwtX5MkCT668JVQZgSCyf8siPSD9ZjcM8f3cO+P6/UTXB+zt7LbN2hcW41xMKrXZ5Qk49/sXIaAMUt/F0lOI0UIUP0xYKihJ0zJb5ftnwlsvzRkMQP+nddAd80QSr39oAZfaYU2oCNLLULZg8cGGkpeNOrB1dfHXtTLFJYYp9wWjqPh6JCpLUnbGKfEvToHyUs5sfAJ9PCAwJXXRFpCKxCQWLv1dmYawiIp9CYux20PBAU8AiIzP8rVkXE4Wl/wWUcUcYFOZfGesa/zffkBTDHl+aoEuHd5MB7Q== 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=mlMKgQyYN2/HcROsqR8POfXC2T88xWjz3fpXoQGDg2M=; b=OBvWLKT4d8i3Ug0kUQsK/hKjEA2x9kN58GLE5JeFzmb3mTT4eALgiresezqsksZV5T24617YYMrbRnyn+7YNmHC3mUaypApDC5R2LvbSDgUBW6+/ggyUuB+pEEfh6pzrnAbCiJFsLBK3Frc6rLncq1sq4tuZZcGierzbcmj3U01fbk0p2IGNZuSTxNvfK0VOPxVsHml798xiA9Kt8VcuZJwTHZVFkXXU/cHs39obPpICyE4k0BWSmTntU/0kFKfDnLqeDSsjjGV4mjV+mJHfq2zw7xg4hEdEafQG7eznm32BRmsNn6u+ga/2OeYNIbj/WmxLT9XZgaaxBUZ3eIHSbg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB4559.eurprd03.prod.outlook.com (2603:10a6:803:52::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Fri, 11 Feb 2022 09:28:04 +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; Fri, 11 Feb 2022 09:28:04 +0000 Message-ID: Date: Fri, 11 Feb 2022 10:28:03 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [C1XrTr2iEGLi7lJlBU17+1NxSJyzjpEW] X-ClientProxiedBy: AS9PR06CA0052.eurprd06.prod.outlook.com (2603:10a6:20b:463::20) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 05e358ae-15fa-4941-0ae6-08d9ed40ce16 X-MS-TrafficTypeDiagnostic: VI1PR03MB4559:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1sGEM29I+s4W9djbN4A5d6biBY2um7yHzOslp5Ck/cxase/iyz29mRT3ZwFgxq+eJcaeYeVounzJtn7Uwvs+my7o6kJYFCbq2JWi8fDsMrfhcTveYXfpIcniSF5Lr0x8K7TG8NIqoWwBSq/I/qnOEIQ5RAvqTHgLs2YA7J7MKO6ThgInA1kQFqJ1X+ocu0ZKupNFIbMDhtBKztQi0P2aptLfzvUppDsuFxDXwqZSdbGQaNIIz4gnKbUpv68HGLq78bXJJVC6kPzB+ZR2LHRZIHt6UQAcZ5HTn3xPHeZrOxr+LldNeWN7cVuY0SodVUPx+FT2eM54Xg+5mI+iqJ9kTnnEE4DUNyVbbj/Sw9F64/Vt4F8tqiH8l4nzPB7VlDzVv3+0KQQ1nthMajcnhXKsG3hhWG3QTEfI4kG62/4CjUUhSprkUaIZbnayD1SvUiyFG/O22GZVeu0HY3PazDpoKBebCBaMh93l6qO6GPTSTXqRR0Ko6pLYi20ONGr2nt4CocKVbcC3+uh+XCfGV2qK/2unIL7Se5LFevGJmIqJY/eJM3x3qJUKcAGqAuNHMHH9pyityz8Xb1qwNfF9zNEA+A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OTJka1ZjVy9XcHdWRFVHZWViMnRNRExteklNR25Hd3BqTTIrNTBWekJEelNt?= =?utf-8?B?TStZcHBGd0t4NWJzS2FBM3lPUlFvSXZhSUpCTHlSMisxak0yS3hvMnFCRFM2?= =?utf-8?B?cVhyMzluWkh5NGs0S0hWOHdzNEFYTFB1YXNEWEg3ZXNpZ3FLU2p0WVFVZVU5?= =?utf-8?B?WVZ3Y0o4U0RDdjhMdUpFT09zZXR0OWxoaGN6WlJCaE9HYXhpNjJ4ZUZMbmNj?= =?utf-8?B?QU5VQm5yUjJxNWFrVjdvREY2Njd3RVI0cjhCWVJISTAzSmlyYXFpaVNGdlJr?= =?utf-8?B?WFNFRjA5dXUxSzZhLzVmd3duU3JTd3pNVFZSTHIzSWZ2ZElnS1l6amczanJ5?= =?utf-8?B?M0NyZFpDbUJYc3VqSUdzcjMrTGgwMFNKWjc5ZUhhM2lFb0xob20zZ2NBR05S?= =?utf-8?B?SGpwNHhpNEhkY0NrVFgwYksvcXIrS2Zkd1dkVnJPTkJVclJ2UjZGb01jQjVK?= =?utf-8?B?N0FBdzZWallGUU05WVR3M1lXSUE5alBZTmZZcU1idmM1Y015MFEwRlo5WWEy?= =?utf-8?B?Q1dnNjhNb3p1T3gzQW5DQjNRRG96MktDMUdMU3o5QmNodHNTeWtqQ21adWFQ?= =?utf-8?B?Yy9jd2RKZjd5SDZDL21zWFJMZkdFUlg4akFxdFFNSk15Ukp5UUxka1hNZzFh?= =?utf-8?B?enlTSnNTTFluem9OQWF1NngyN2J2RHU5ckNzZUswZ1lSZy9ZZFQ2Ry9XMEtx?= =?utf-8?B?QnhSMXhsblljZytiTStKMkhjbWtvb3dieVVvODFOSXY5NTNMMzVxVm9vNGd1?= =?utf-8?B?UmpyNmRBKzUrTU0xRTZmcU14L2kreUoyTGlrQ1puRTBjMVUreHN5NjZscWl6?= =?utf-8?B?aFB1Y1lIczZ3OWljRXFkS1psV0tGNkZ1RWRjZk1mOGozKzZLSlUxQTBrdjZz?= =?utf-8?B?YUlkRmFUZFQ2SExlK2Qxek9vRWU4SDFYSTQrSHNzU3VxQ08wNkdQUmdvcDVK?= =?utf-8?B?KzZxMGZDbzJDUVpTRkcyT2dsZ1FvQ3NoZ2tsK2VBakZwWVEzbXV1ODBEL05a?= =?utf-8?B?ZWQ3QlpWU0pKL0x5MURJYTF3a3ZhTVNrWWV2Z2dYR2czRUNNNDVzOUFTOVRC?= =?utf-8?B?VG5adDRPODhHSXBkN1U4ZTRyVHV4N2hmNHU4S3RVbUV3QTNuYkFGWHFweDdS?= =?utf-8?B?SkhKV01HNjJCNEFDTmlMMFdtVUVzTnRocGRlYlJzRFg5TTVDOFR0dVZKczRK?= =?utf-8?B?YTJWK3FlMXYrMmplbGJrWEcwd3NpT05ueGxZYytaV1ljN1ZlbXpjbjJpdXNR?= =?utf-8?B?am83c3BIMXR5V2FlSDUxa2g4WTE3OXJWbXc5ZnptVmd1R0RYQT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05e358ae-15fa-4941-0ae6-08d9ed40ce16 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 09:28:04.2585 (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: VI1PR03MB4559 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > 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; Will apply this later tonight unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".