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 CA9D44B3F9 for ; Wed, 5 Jun 2024 10:07:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F8D968D6E8; Wed, 5 Jun 2024 13:07:19 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2070.outbound.protection.outlook.com [40.92.89.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7CC1168D6B9 for ; Wed, 5 Jun 2024 13:07:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jAmHgXE+4Y7/APcWm+mT+8yf1c8dsHQAqbqmQJjeJ3y68zymDSVj1Xam/RoRZ5DapIlS1y4t9U3DpLUajzpYbTyUBzL8FKRLQDszh8P3onxlwiYAJM+3psx9yl6oPHhXK5MKcMnI9PbWYVvh5ah/rBefw0OR/dOGLL6EGREJwu0oKO2Xd6IZz6eaJxLFUZmH9ICIzt0sGNc5N/4nSr8f+V4KAmD2LyVw7GdfZDxk/GsMQDCbcUtgJrrfteVoxMW3EXlKyw1oO7T/lCxYSqM7e5vyGeXxrRYO4g8qzNxeogKmygR/AJC7wAw7SP8L9NZ7yCaWDpWcZ8I10QI7AHKcIA== 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=6Rl+pprnlh9HSHcgn+DVf26xnOVU6/R/icCZTfWeQH4=; b=kFKLKKhMrBdre0xpxrrWBxC0tz3ekAHhG07MDRHZ9WKRWwpNnwWtX3FsnCkUOLX7DVSLW1DsdG7ZsfgFJnWU7Mg+3tT0z9r3f/IPiMee+0+8vfEeVT++UXNfgdsjIy0KcgNpqh17T3TeIGBgSEZJ48MbWpWvP6J3RiO89jpxMAkiHn2qohPxuwaV2+2/lQp7jtNA+y9xWGeJKJYZe3cReBWI1LREa6fnHoCtUY4MLsCqrWRGdUqvgoMz4xMA0xvgPyymczOawONscFvn32skLPBsRQKZ3IuPRUmRw7e4E/WziIii8RDJt8yQx/EjmZnzmc7tCbNL5n5gxg0wq4P9vw== 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=6Rl+pprnlh9HSHcgn+DVf26xnOVU6/R/icCZTfWeQH4=; b=FgOoCkcs9yBSbArDL6vKbVELBO6HPIgMUWzQ40hvutUBAjCJ6vmA5IIX4ZWzFImK3R2D8jcAO0Rf3sZDwoo7UWs6JflWqTnUzncq5ciJDE6h+l0/QXmSAI8y8FoPdfHylka+cgzkWsU948bMpE5yzFta3tTW81mQCKUPLRB6KcCZlX9qiy4mXRK6L8+t2aV1uevYwe5aDY5CuMHg0tJk69bXPZ8zb9SMzoAJ5SHIdGwj3ZzhQSDEOc3gsp9KNcifauEt1wsBWtdACxOpsOJdF8gDFa4kXHyVZK7d520LeA8XTrni+u8hbTSOtWsOikzsr0hz7fDqRT3boj4F1l2Ygg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0176.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:275::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.27; Wed, 5 Jun 2024 10:07:10 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 10:07:10 +0000 Message-ID: Date: Wed, 5 Jun 2024 12:07:08 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240605095959.17135-1-ffmpeg@haasn.xyz> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240605095959.17135-1-ffmpeg@haasn.xyz> X-TMN: [yH7zDcuqHus9IMxgpZ+pMJ/mOaUwkPx7r49KqG4mfUE=] X-ClientProxiedBy: FR4P281CA0335.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ea::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <0f72c596-dba9-4b85-b045-be69d4f2a170@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0176:EE_ X-MS-Office365-Filtering-Correlation-Id: b0fa4ed5-c899-4395-6f9a-08dc8547436e X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: CxyS0dAQGYdXYbRmRAiIOC5KTHPJd+Lx5Zr3xu1gVUH+rXfyeT18WkADaCyBR3FBjff92n8DqAh4PRuvC1c02FuvlqpHicMFLYuZhBplLzhzCH6V3AhJD8ZyL8vPjLwREkoNlbU6bx071Ealx3jTqM23dDd7vTiecxrAxajWqAoZhFDHevwdXHRzTfjHiuyJN/L4M9T1HoqdlziXKsWnJqb01GU0nTNvC96U7iKB8vQNatKb+vbAASwg6aY8QYNFdbtvHgGRyIpXBUr6dWZ1EXCVbr60cIrNYohwqBxlyCLW1G9aPqjKE+VAQa+HwLzlQsUA5Ts48tAh0hMUvccl6DuKCTEfKAMX+7At9PPbb4+QFfG6X38YXpWW+Kfei33q9Svbw80FaWmWQPeX1Dw7pxJCt6rt1/sehIvAivvERXECjdRdq6sTMhqSrskemVW0eviMb2dGVqZj3+8W7aG8OSqiVyjJiqU4i2HcaSqJ4uo29CBlSKeZGCUxUlzV+9VvGAVVurbFVRZWFTT+QkLhd2CPljBcMbn3FLtmTkiMkop1RbfkLSCk8MvCRfkUwKdN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?THZLK2VUM1FaS3MzeDhiN3UzelBDNmVEMG1DYitqRE5VMVFhZFliMWdRL0pH?= =?utf-8?B?aHhCUEVwT1FINkdCMWFOQXRuQVU0Qld5NXV3THgrSUQrRWd3cXAxY2o0eExR?= =?utf-8?B?NklhQSs3N0tZMUZXRDA5NmFsRnA2b3BWdjZTOE9wN0IyQ1NMSWUxREp5RE5D?= =?utf-8?B?VURSTFgwVXpScjRNUVRKUmpJWmRHVW11QVhQNWl5UjZ6UVZKYVVuUzlKQXQ1?= =?utf-8?B?cTdWdnBtbTFNMWhYeUNCbzdWOVRzaE9CZWszR3BuSFhpdWRoaVZ2bDVTcEYv?= =?utf-8?B?SktEeDNBUUw4VDRxS1Y0TXRTOUNxYkJwcmVyS1JjaFJtMWdNZEhPRUJ5ZWVl?= =?utf-8?B?WXd6WnNwRkdWT2YzM0VVNGFhTENlcDFaSTQ3VloxMXBZVnRHV2J4NXBObmRE?= =?utf-8?B?OW1aS3RjVkNpazlVQ2I2QlZibmVuczl4SVBxckU1aXBsNTl1aDFwSHJZbFVZ?= =?utf-8?B?RG9iV0pmZjk1Z1BncENlYlMwaUZvSkR3S1dNS3JOcDFwODNua2JzM1pxd3NZ?= =?utf-8?B?Q3pQaVd2L0RRRytZMzRvN3B6V3IxWlhjWjdiVlhHbDIrbFFmSTlVdGNDbFNU?= =?utf-8?B?SUhrOTVFeldNS2oyU1FtNXBVY2h0OXU5OHc2cW1ZQXdFbXJJU2JVQ2UxZ3VO?= =?utf-8?B?Tkx4Rm5WakZtRGRuU3V5d0NOVlZNaGlKOWZmUXFlVU45S3FnZGZPRjZheFYy?= =?utf-8?B?S1hzWHVWalBrWFA3V0VmcDhwSEtCdnJZcmlDSzY2WnA0UDA4ck5ZWk1IVUti?= =?utf-8?B?aXFPWCt5c0lrb0R0QlFDN1N0ZE45TDhxSDEwRzhrejJWcDVxYUE0cWJUVy9Z?= =?utf-8?B?aWdMVlhsSUYweVplNU5ib1h1eDhLSHcxd0FVNy9VT2RpSmI5VTRRSjFCY0ox?= =?utf-8?B?c1FIOGgzRHJzdUQwcTNlOEpDNWIwNktCdkhTUlV6SVJUZ0lKVHNEVDgyeCt4?= =?utf-8?B?YVp5cGRiT1o1Y2UzRERReUFnbWxBZDRyTTY5M0xzTzMrY1E1c1ZpUG53dVEr?= =?utf-8?B?T3RKcGhVdjZDZG8zbmZlVmI2V1h5NHJZKzBZMk4wZEpoTVdFZE5DTlo3em9Z?= =?utf-8?B?QnRTeUl2SG1IenBkMUNjbkQ0b0Y3bzRSWnV1NDc5OHZ2RWF4bUR2QmE1aGVo?= =?utf-8?B?WVlwSG5xUXZBWEpxN1p2eDBKdVUybVJQSVRaOFYxK1RzbVVhTThmaTRnWWwy?= =?utf-8?B?U2dNOHV2QmlodUhPMUs0SFNYdEZqTTdHWW1hRXpEM1M1dWpwbmgzNDNzd2tC?= =?utf-8?B?N3JORFBxWHg3bTNHZFR5cmZTU0RMZmREdE1XODE1bVFvbTk2Vmx4b1krZFBJ?= =?utf-8?B?RDc3Vy83TEgvTFdkc3QzdXgyOFpoYVE3dTRFZ2NVdkdSeWJjbTlWdGZ1VkQ4?= =?utf-8?B?UlBCUitaV2VzUHFmM0lzN0JjVWQxS3V2ZEc0MUtGSXEwd3d2ODZuK2ZYd0dE?= =?utf-8?B?YmVoVXZtTlFkTVIvVmlac3FQZXRmKzRTaWgvSzc4OTh6OHQwY3BDZ25ZZTIy?= =?utf-8?B?VEY1M1B2QnlyUHJGekNkb3BVK0daellYazMwVXlkZjJKRlZpYi9CWEo0M0dI?= =?utf-8?B?U1J3VHkrdVJVOFhyQUFwczVxTFlxeVpwRGRMREFSNjh2LzNCOGVXTU9JNlpq?= =?utf-8?B?OXBpZGMyUE5tRVgzL3NESTFGUHFOUXNyMno5RUNZYnhuL2hnMWF5bWxkK08y?= =?utf-8?B?dllmYUNRR3plck1zYXpOWXp5SkpIVWRVM25CN3MwN0ZQUnc5M1Z5cjhBPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0fa4ed5-c899-4395-6f9a-08dc8547436e X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 10:07:10.2664 (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: DU2P250MB0176 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/dovi_rpudec: replace brittle struct copying code 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: Niklas Haas: > From: Niklas Haas > > This code was unnecessarily trying to be robust against downgrades of > libavutil (relative to the version libavcodec was compiled against), but > in the process, ended up with very brittle code that is easy to > accidentally forget to update when adding new fields. > > Instead, do the obvious thing and just directly copy the parts of the > struct known at compile time. Since it is not generally supported to > link against a version of libavutil older than the version libavcodec > was compiled against, the struct shrinking externally is not a case we > need to be worrying about. The exact opposite is true: The code is trying to be robust against upgrades of libavutil. The reason for this is potential trailing padding in the structures that are copied here. It may be used for actual stuff in a future libavutil and the approach you use here allows the compiler to clobber it. (How would this code be robust against downgrades of libavutil at all? There is no check here that sizeof of the side data is big enough to contain everything we expect it to contain.) > --- > libavcodec/dovi_rpudec.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c > index 7c7eda9d09..adf2c00cf5 100644 > --- a/libavcodec/dovi_rpudec.c > +++ b/libavcodec/dovi_rpudec.c > @@ -56,14 +56,12 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame) > return AVERROR(ENOMEM); > } > > - /* Copy only the parts of these structs known to us at compiler-time. */ > -#define COPY(t, a, b, last) memcpy(a, b, offsetof(t, last) + sizeof((b)->last)) > - COPY(AVDOVIRpuDataHeader, av_dovi_get_header(dovi), &s->header, disable_residual_flag); > - COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq_pivots); > - COPY(AVDOVIColorMetadata, av_dovi_get_color(dovi), s->color, source_diagonal); > - ext_sz = FFMIN(sizeof(AVDOVIDmData), dovi->ext_block_size); > + *av_dovi_get_header(dovi) = s->header; > + *av_dovi_get_mapping(dovi) = *s->mapping; > + *av_dovi_get_color(dovi) = *s->color; > + av_assert0(dovi->ext_block_size >= sizeof(AVDOVIDmData)); > for (int i = 0; i < s->num_ext_blocks; i++) > - memcpy(av_dovi_get_ext(dovi, i), &s->ext_blocks[i], ext_sz); > + *av_dovi_get_ext(dovi, i) = s->ext_blocks[i]; > dovi->num_ext_blocks = s->num_ext_blocks; > return 0; > } _______________________________________________ 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".