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 BA84849284 for ; Fri, 8 Mar 2024 00:05:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D3FF168CCAA; Fri, 8 Mar 2024 02:05:05 +0200 (EET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2034.outbound.protection.outlook.com [40.92.89.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82D6D68C09E for ; Fri, 8 Mar 2024 02:04:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BPleUXDg3yeVYdu9FMo0YXM0HvZuMAmxecW/EL3elBk59lSd7sySpIQ+QwPNHu+YNygWMcmlU3k5ITh1oMQCmC9+UkT1fC//HAJNjcu+NKeeAS4X8SE/PDLqa5eWSwtOQVLpmM7LNLqmVuVqBj58rIEBYSyGXJvV57ASQxrF2pEL9UXLTSXIGPB0OSt0cid8irQuFwsyJC9kX8sBFJ5KAa406hIoHA39Cjh1uCoSwMHrAc1PQS9Uh8QhkPvTp8bPSA+iwTtUGVwQMKU8nn4txK9fandrJNMsqR4dM+qzbe/3DHVKL+NKePcvF1oGCRURXzE5gW2WAVSX5MhkDnKlWg== 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=6c8ZjovBd4fiRFdw6P6eY6JqkpCdE69amPH/8fxE3zg=; b=kq6pgzKfIDqGPnvggeQBxwzhPGYE+dtf2VwgT32QJcz4x/RQMEmxicTSQFjAJD8KBuAfwXcmHJb5YloHKYOvZlDmXzBu0ZllfH3OoEDOua3fdGYUaNbBKcTyH5ilIXPSCUO9doTq5NhlZ/H5/jir3Vo0PKxLk2zw0fny+PmSW/cdv4aX8AJ6FIUCUEgK6m9dlAvbv5JYD/PXBevA5QjWYgbzLVIjADN49PjLFcoJLZdtrbr/DU51fnX0acjYc4mrY0pe1xyQgaj8l/bSRI8QeWdhCnJi+mAts8hKcrmb8+c55Egs3r6FzYF9rxPZVVBANLatqnOt1t65wLmlVU1Xew== 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=6c8ZjovBd4fiRFdw6P6eY6JqkpCdE69amPH/8fxE3zg=; b=ChZBFfFI/E/qahqFlqRfyRR38/wkPrCGVJp8UhRD5RC8nwiqxtmEN2o8+OHzDaQdT8XuPxePPkrEJwigY26pVToED+xmAAktutjgJHgDI459iaixw8NSZ1aDvS7jnwwCVc67YgPMonZT/F5N+6tqg+pmlZPMg4maeR3wQUVZtF8FAxhBZqIf6sGfkH4eXulK+QbB5yAaluf65LJIVp0K7xKYAjdASwsNYfy4PWxxfTeGj7ckSDXzQK7cqiXpVZbl1lfD4VLt38MFmN3oSgTb4ruO2C6lBCXW8YcVReUZrlGFoPw4utxeC33aUg5yAnaoYrZRKPFduPWou3KoUJL5cA== Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) by DB9P250MB0497.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:33d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.26; Fri, 8 Mar 2024 00:04:58 +0000 Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b]) by GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b%5]) with mapi id 15.20.7339.035; Fri, 8 Mar 2024 00:04:57 +0000 Message-ID: Date: Fri, 8 Mar 2024 01:04:57 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [dWTJ+RH8+nM4I9T2tPMIIo5hBCiXnmNklVmBvo7kKwI=] X-ClientProxiedBy: FR0P281CA0110.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a8::6) To GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) X-Microsoft-Original-Message-ID: <354c95cd-7375-45e8-9fdd-5ab874a116f2@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0052:EE_|DB9P250MB0497:EE_ X-MS-Office365-Filtering-Correlation-Id: 1bdc267c-f257-481d-004f-08dc3f03642b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2xQW7hQ4CwXlp/ncUUTjXlkV5URAamG1DVftNSZMKsiHysM/KOEEz0ZDPg+5sbh9nOmoQ2IvGe2OFdE/XqiQ9XMit2+LDi3kf76ikHShtR56jRNAxBK+PkPlyshN5S6h9Ug6Yg+CAjbthO/EnPuiBK9w+EU1ymw8VgI7KfUJBzC4NZglqzl1hmir5R+X4x1sJI442/106UepgYsFA96EvB4QUqnHGO6hMCAOGjTkqOTtmNdE67oD5lriH2jS3l+MN+zq7MOxXYXMHKcVo2Dt+koSAFCcHYbnelfxqZmHqL4mxy8y5anrKGOJn31hsyOozbLRXI1IR4sWNBXHCNQMuy9pIhYN/aow3bpS6cnQaqdzzqpB2Cq4Y6ztKpGdqwmzOX6wjSx8Hk5tZ7QRh+sMM07eG7ahuum+Ou0s5Q6yDN4lB6OUlgl3ZwatjUs/v9XOGPaxmJsP96VoMEtPjix7EmnTNDzQM6lSvApcAKxmccGvLsSy4kwk8Vp365DnSPoo1Ir/BJTMeye5bpA7iVBvXYL6KEe4PQ4fKN+2p0i6j7zAvfe/3wdycvYOAiVyiFxj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SWtLalRZMHRRaE1kMVl6S1ZBV2Z5c01rcEJVN0FnRFJWNG1URy9hSCtVQXRN?= =?utf-8?B?TU0yRy9ySWtJaHNkWlBGcEZzVkRDUzN5NlRIcEcwdnErR3k3SWFTNVFFZElu?= =?utf-8?B?RE1tb1dFZ1lQSFd5NzNYeEg1bXhQcHZVMVJJWUtwQ2N2aTQySWFDR21tcllK?= =?utf-8?B?YlR2cVlRbklzS2h6d0FUVlVkbTlSYmlYUnlqbURJL2J1TnFYRnVOK2hZcmxo?= =?utf-8?B?OTB6bHMwcDk4SjVPNUxnZWZKdHdBMXQ2ZlpZZ2dpTlY0Mks1TnBQR1pjdVJR?= =?utf-8?B?WUVtVUdCa2xacjUwWXMxRFYzUFJ6M1YvNklOMkdRQnUzdXQ0U3ppUnNxRloz?= =?utf-8?B?VmVRcE8yMFdDYm4wQjdnM3h2TFhKR0p6SE9iVlA3K01sVXB3ZEIwdm1RUmk5?= =?utf-8?B?T3Z2eDdHQm5PTTFLdVRGZm5DMlNOZUFtNU1XcUJUdHFaa244NEJ1c3h0MnA5?= =?utf-8?B?bXdTTlJXTEFUaTB4NHh1VENGN0wzR3R4VkwySUx5MWlDSjJ4aGJOTTdPbnVj?= =?utf-8?B?aGNyNnJlZDZGb3FnZ2RmQWlXdXV0MVYrUDErSCsrVEF4dW1WZGlvVmJHei9Z?= =?utf-8?B?cXJoci9UbjN3WFBVc1dnRnpnWTNGc1Y4Z3JvUks3YzJ6VytYNC9ORjZ1Qkxo?= =?utf-8?B?ay9leDVEbzdIRU5WZ3hCZnE3cGRPbWczYi91RHdSeVJ3TVNKd0ZqUXdXWU1r?= =?utf-8?B?RUU1amJUU2pJMEV1MHJWeFkwMEZtRnA1NGIrVlRjTjRMbUZMQTNiTE8yelZh?= =?utf-8?B?K2J2S3loOWV2dXNtUVEvK0R0ZW5POG05ZUR1Rm9rOEFQM2xId3NjTGh3YXVj?= =?utf-8?B?OVJUdm9wckRmWmplSjdTUmxnSmFBTjZxQ3pIMHl6ZXRzNEhKdTc4bmpMU2Fs?= =?utf-8?B?MllJS2JKQWEzYkRLOGhsSXhDZ0U1SjNwanA2N3RyN2hTYVFXb3lZaTBKdFVq?= =?utf-8?B?ZHpOei93STA0VlZzUzZmRFdDRzZsSzg4Y1k4MW9vTGpYMmRveW9iWUFmWXNt?= =?utf-8?B?ZllzSW5rOHZ6aFkybjVmcWhBZHc2UlhvMFNsSlp1aXhvWno5MnVESkNLUjFG?= =?utf-8?B?MVhqVnhpTUNQdEFreC9QcFcrVWo1MEcrbXArMmxQRTE3Q1lhd3JLU2lhRUlZ?= =?utf-8?B?NGMydWwybmJBZWlCZVZBbmVNRjdwV0NsWTcvd05GdHBrVm1EUlVtY3AyMWJW?= =?utf-8?B?a3UwWGJwcWh6NjZOLzQ0YlNaNlZDUkx4ZDZ5VDVEeWV6QjF6WWRUQStQeUpj?= =?utf-8?B?T1JqUUhkOHRpK1RFanZGc2Z0YmFveFRQUXRqaFd6WEx4SHJRVFRTQnNMSExz?= =?utf-8?B?S1lVRlFKd0lzMWQ4a3VGWVRZbnU3S0pmb3Irb3YyWmpweHVSVzhGZnVMTUZ4?= =?utf-8?B?NVdXeXRLei9FUTI5WDFGU1ZiWnc4R1dQN3RWN3VVb2VFR3FOVmJhQ1pSSmRh?= =?utf-8?B?Y3phS3M3blNoNXp1Si9TcGFPeGpKQWxQbkthcVp0eTlqU1lBYk1GUGpydjBQ?= =?utf-8?B?WU9Qd0VLbXY1NllDS3pXUlNNbWtENVpYRFkyK05Md04yNk1aRUhzVnY0VFlQ?= =?utf-8?B?LzNXYS9sa21mdTBpOVlGV29menAvWHZnOEpYQVVRMlJOeHc0VmxnbU1nRlFD?= =?utf-8?B?L3VXVEl2Vm1WVFllWUs3aEFHOTBTTW0rUjVWd082YzVwckxiNGg3N0F0UGRJ?= =?utf-8?B?M1REKzUwNVZIQTUrbk03MnpNQTZKTXh1aEZnWXplYnEycE9jM3lzR3d3PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bdc267c-f257-481d-004f-08dc3f03642b X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2024 00:04:57.9147 (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: DB9P250MB0497 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/xpmdec: Avoid unnecessary size_t->int conversion 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: > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/xpmdec.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c > index 5bc02378c8..e7f8a90fdc 100644 > --- a/libavcodec/xpmdec.c > +++ b/libavcodec/xpmdec.c > @@ -233,14 +233,12 @@ static size_t mod_strcspn(const char *string, const char *reject) > return i; > } > > -static uint32_t color_string_to_rgba(const char *p, int len) > +static uint32_t color_string_to_rgba(const char *p, size_t len) > { > uint32_t ret = 0xFF000000; > const ColorEntry *entry; > char color_name[100]; > > - len = FFMIN(FFMAX(len, 0), sizeof(color_name) - 1); > - > if (*p == '#') { > p++; > len--; > @@ -271,6 +269,7 @@ static uint32_t color_string_to_rgba(const char *p, int len) > (hex_char_to_number(p[0]) << 28); > } > } else { > + len = FFMIN(len, sizeof(color_name) - 1); > strncpy(color_name, p, len); > color_name[len] = '\0'; > > @@ -375,7 +374,7 @@ static int xpm_decode_frame(AVCodecContext *avctx, AVFrame *p, > > for (i = 0; i < ncolors; i++) { > const uint8_t *index; > - int len; > + size_t len; > > ptr += mod_strcspn(ptr, "\"") + 1; > if (end - ptr < cpp) Will apply this patch tomorrow 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".