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 A2B58494D5 for ; Wed, 13 Mar 2024 00:42:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E44468CFCC; Wed, 13 Mar 2024 02:42:13 +0200 (EET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2092.outbound.protection.outlook.com [40.92.64.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 818D568CC60 for ; Wed, 13 Mar 2024 02:42:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OqklDGiPKR6//aJTyluy+deve+MYAe8og5zL/MRazaxd9aNhuFRWt5RFBsK8EnwZgM7wKCcf6OUQNyEx2+YXIy2gDAFJ4MDsoBeU3Um0C9fwa4XM+nqWhyFHPWRdVeAexDFjwZ6l6BSrqQmp9pb/IZI1694dY7TWpsiw091rWFYiQHs+rqfQwkjLrp8ukXOWutLlg6OzFYZsPEaNsYakP708S3cqfKxn2zmUwHb/qK21fKeMEBUX4kOssP3jJJBCUxSkS5Pc7ggxPrDMqGs5ZZjGnqVq2uyRuffCl4FEdAWoxXr9W3ODjCYELLol5Tzvn0bpnG+EnvCEOFfvRsy1WQ== 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=cbOGJQHM3qzStmIIsWDdgBhjCUm9twOxTNbymisicAs=; b=K/RPOL6ivRBDrG00P4gVkaUhZbiJZzbklmI3krGJNRTH9yNdo/chLn3M64Gle4jqnG25JS12xKEA8YGfNglqKIGWOX7pQUELeLYYiI0NvftERb2rQoOslboPkZL91OUu/uqzj2InbV/usFOf30XiWC4Ksy27MB+AGb9XCEJbwk7mG0n2cQLVxiB916IBNPOa9uKSTfXT+9kDberEhTQtsl9r9lsv+mD66eYrnTO8Pa1z3WwFBGG3hlxkxMMZShOAOK8vQOCl57WLuEhZ6QqnA9sy6UPf8DkczxTy9rSRBpKhyHbBUfTS3QHSFyjFMVzHfbBoF2+GqeA3JxVKEXjDPw== 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=cbOGJQHM3qzStmIIsWDdgBhjCUm9twOxTNbymisicAs=; b=VLzBHQHK2p60ezIc6Otv6T2St4gRHTx5LP5tRFB8YKccdRIRimXgy3tJrP53F1ZibJnvqXRfzgcOzJmCi6Xdv/6MpeQyMQfolOAlecOMy0q9xZ73OQGUtm27k8e8ju0zZnD4X2sIzmcKE6LxXEuqTb5nbTyHeV9hZ2fLkVV9PMlk4vfqo21Pcg/eMzwhDfAae4WkoO3Bl/j5QXoBPCw0ucsT998k6kae8KYY3OWbmA/6dyJbs964Nf/bXY0dAdcGBlxWYa48ZmCOAKUts0c1wD4Ucwm29Xutc/r4Gm06sgzkNBPCnnAyuHLXkmcpfph0+kylBd/2APZG6pM/F8qxsA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PAXP250MB0566.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:281::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.35; Wed, 13 Mar 2024 00:42:05 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Wed, 13 Mar 2024 00:42:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Mar 2024 01:41:58 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [AQtvWyQYSHhAlf5oixq8IxfTryjhJrSzj17EUfLfS9k=] X-ClientProxiedBy: ZR2P278CA0006.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240313004158.2020498-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PAXP250MB0566:EE_ X-MS-Office365-Filtering-Correlation-Id: a7b0e13e-5895-4da0-277a-08dc42f667fb X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PPVxzjY1MxJV0PAnC09JEUFyPwbY++R4XDnWyMaxK0MRZBRoXpTeo+d2H+V/3TnLusnvSjuQBrpnxS//uqEI+xagpXdUeCX/wwYsTaQ0se/lQHrSMsND2F0DavR+YmpkC1VIfFB+onR7wyaxf9xU+63+PyAK6Ki+eOuHjtqo8/JemZ9CKluWnVeAvaam7fWrHVq5idinlNmH1SBaQKsShZ9lSYEFU74lPp65+B3W06s5s+AwIUcdzSdUw9nyxPt2YhZF1AQ5z4/M5LVCGZF/nPJhkN8Ffd7mDIsnDgkT8+LHnA9/aRxEXqMMa6MYBpspKykjdNHANHWmknntkvOoI7WS4YaktrsMbvVOgzI6ra8REOvDlgRQDhPnPVexpcBAGkYZprPFLsnjse0u86uZ4qejUVw1XHyfIjLV+q9M3V3iY1Ut028wqB8eULRIuyMJIkkhYBQnBzGzSb8DaPvNB4jEbtN6WRzXvIzDUjc/fBbe8cKszDKwpfKWvwqbS1WDdH3U0TANp4rYGHeBvcX+vrGYYy4jjhPCzso+pv0JRpvxEt5st3S+8o+MYG+5e4pwCdpQACYyEa0dtz/RbX2BDGeR+p6sa0b/gUfb1fc7djNqKTOdtTTsCHjTkhFoidRH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?x3HDRCEx25jMaxO48JbcA/JeSXh+gG0eTzX/5TLnBdX6AVHdF1BWoNl2hONW?= =?us-ascii?Q?2+IUL7zt6sdjLmbBb4TMUOqiweDf83sSngtsMbFwaAITF4Mr7YRPwaCeMknK?= =?us-ascii?Q?V2fLVasn9v+tMGwewAfaOgKwF3utiOzRYekWNYyvWBylmhxIOD3cOAFtuEKk?= =?us-ascii?Q?WeeqPbAGJNPjG/0BRK7wpODKei+r/peZySv1CQKC+n6XaUjN9Ff7DwNUrNcI?= =?us-ascii?Q?NAKY+aS9Soja3YykWi7VcMKnxR5xB5F3D3nayGgSZI1TasuGeePe/wqfENXT?= =?us-ascii?Q?UURpOa7nHgxB24j75lY7Xu4wkSUUrpzcXxvcki+qsZgrwklRVoGZnNq0FDuF?= =?us-ascii?Q?q3mpOsE9yySGadFi0XKmxA8eVeH8QRX2/tC6lj61Y2UTLy9c7xi18qPHgOSR?= =?us-ascii?Q?07n4oV9jfoHa7CpLjXfBGS8APjg/LQriCtldIGqorAWaG1/RRIHpEv41OCqm?= =?us-ascii?Q?Oldy7YXFwLxKzlHXcXGXq22iaUInbiDWgYsGLZ8OPfbniSnjQuh0OKudqK9O?= =?us-ascii?Q?ggrauMWuziLz9/0n8k1tD/zHk/L8CLWaWHLYgKkkClePS3Zp/Tt+OF4tYXqq?= =?us-ascii?Q?MigrvtRxTwDam+LCAKENb48fu66Rah6jrDw3GvEUS0d6hWfnIwt8wLWIHFz/?= =?us-ascii?Q?PqjcHGLokK38KkaiJKiGl+2q3fdZmj7XBKvWEbkZmwm9RNUwBM6LLaxB6k4+?= =?us-ascii?Q?Q3xyFlHaz+p1ulcw5ICPOWX4+Sd4RQixLZ4a/YkLPiG1+kKdPKP6alM9NmGn?= =?us-ascii?Q?9FUjWBYVdhd3sXi62mT+rhBUw+Kw8daj4h5s7CTNRIafKqqigg+l0ozopek+?= =?us-ascii?Q?XvX/clvW6tF9ihzz68UE8i3DgbGlHfRs9KYthmbJ1wb3+59O+PDy9wVMhyHH?= =?us-ascii?Q?w2o1ZnSoMOZnikl1yXjjV+yo7ASfq0UEvZDo3HmbYHkLF+j02Wb6Q92UN7+I?= =?us-ascii?Q?bA1gYzNd+Z57bkwK05zoJzL1kRXmitETn0afrLErQL+/SnYszRq777JBEjc3?= =?us-ascii?Q?TncPGKojh6Nq5A3H17f2I4MnwbzMC8Jx6EjFiYtEcKVDR6IwQIVKNUFJ+SY6?= =?us-ascii?Q?f/YfgSUy8wrhKjtC57EVYQhMNZYAHZvE8lhxs+vZJfhnWHTDXecOcd9FQlxD?= =?us-ascii?Q?g1SvgZKINN+ADZRhN2LngNpa0bZaBuy/86TsWoEqIrhHJXF4OYIpOcOs/iSB?= =?us-ascii?Q?dB7xWNz2lxGE/xCbv/ZPQYL9+PVEUqWk5ZiOv2Q3RyY/nH+Fz8SsFbcZCKzv?= =?us-ascii?Q?KPgJ+Q9zS3Kis0fYkpEWDp7Fi/gCRjNOkg0RRaIP3A=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7b0e13e-5895-4da0-277a-08dc42f667fb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2024 00:42:05.5661 (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: PAXP250MB0566 Subject: [FFmpeg-devel] [PATCH] avcodec/lossless_videoencdsp: Fix unaligned access 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 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: HAVE_FAST_UNALIGNED being true does not imply that one can simply read from any pointer via *(long*). It is undefined behaviour in case the pointer is not sufficiently aligned; and even if it is, it is (likely) a violation of the effective-type rules. Fix both of these by using the appropriate AV_[RW]N macros. Also, the current code used sizeof(long) as if this were the CPU's native arithmetic size, but this is not true on 64bit Windows. This has been fixed, too. This affected huffyuv FATE-tests. Signed-off-by: Andreas Rheinhardt --- libavcodec/lossless_videoencdsp.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/libavcodec/lossless_videoencdsp.c b/libavcodec/lossless_videoencdsp.c index e2dc99e201..8d03a5b5c6 100644 --- a/libavcodec/lossless_videoencdsp.c +++ b/libavcodec/lossless_videoencdsp.c @@ -18,19 +18,31 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/intreadwrite.h" #include "lossless_videoencdsp.h" #include "mathops.h" +#if HAVE_FAST_64BIT +typedef uint64_t uint_native; +#define READ AV_RN64 +#define READA AV_RN64A +#define WRITEA AV_WN64A +#else +typedef uint32_t uint_native; +#define READ AV_RN32 +#define READA AV_RN32A +#define WRITEA AV_WN32A +#endif // 0x7f7f7f7f or 0x7f7f7f7f7f7f7f7f or whatever, depending on the cpu's native arithmetic size -#define pb_7f (~0UL / 255 * 0x7f) -#define pb_80 (~0UL / 255 * 0x80) +#define pb_7f (~(uint_native)0 / 255 * 0x7f) +#define pb_80 (~(uint_native)0 / 255 * 0x80) static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, intptr_t w) { long i; #if !HAVE_FAST_UNALIGNED - if (((long)src1 | (long)src2) & (sizeof(long) - 1)) { + if (((uintptr_t)src1 | (uintptr_t)src2) & (sizeof(uint_native) - 1)) { for (i = 0; i + 7 < w; i += 8) { dst[i + 0] = src1[i + 0] - src2[i + 0]; dst[i + 1] = src1[i + 1] - src2[i + 1]; @@ -43,11 +55,10 @@ static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, } } else #endif - for (i = 0; i <= w - (int) sizeof(long); i += sizeof(long)) { - long a = *(long *) (src1 + i); - long b = *(long *) (src2 + i); - *(long *) (dst + i) = ((a | pb_80) - (b & pb_7f)) ^ - ((a ^ b ^ pb_80) & pb_80); + for (i = 0; i <= w - (int) sizeof(uint_native); i += sizeof(uint_native)) { + uint_native a = READA(src1 + i); + uint_native b = READ(src2 + i); + WRITEA(dst + i, ((a | pb_80) - (b & pb_7f)) ^ ((a ^ b ^ pb_80) & pb_80)); } for (; i < w; i++) dst[i + 0] = src1[i + 0] - src2[i + 0]; -- 2.40.1 _______________________________________________ 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".