From patchwork Tue Sep 27 01:47:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38378 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp206228pzh; Mon, 26 Sep 2022 18:47:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Q16gnty6tB2gd7Hqm+mcZiIc5STl0dqeR3K1sq2MKrkFml+XP31zqFVFhrPHGLFIN1X7l X-Received: by 2002:a17:907:7204:b0:783:ce92:d75e with SMTP id dr4-20020a170907720400b00783ce92d75emr3625751ejc.682.1664243261093; Mon, 26 Sep 2022 18:47:41 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z8-20020a056402274800b00457463dfc74si470968edd.83.2022.09.26.18.47.40; Mon, 26 Sep 2022 18:47:41 -0700 (PDT) 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=HUN58EHS; 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 7C72068BA15; Tue, 27 Sep 2022 04:47:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2014.outbound.protection.outlook.com [40.92.90.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E29DD68B9EF for ; Tue, 27 Sep 2022 04:47:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GbWGBLRlyR0k4HFsE8Hlz91x3m7yZFEDWbkLwj9Cxe2CGVKJWwnNeDRDkbccLFhoIaS0cUFXiryyVFogC30gIRHyLx7n3HpCoCghygpGu2anmK7040ku2XXPBGOncpCPbF9+RfVw5Qbr9qZLm0866gpxH13y1SLUaaUBhz7RJIJ18UYw0rvN/LEfLWzZZuWcxqU3xDYGRi1/ZZg55Fmfl4CKK9KFBgIxS6ZZpQOCmHM4ABDXwTsTpVB23sXBqcPGQ3X6IjKOyxycesllR80Btj/+3EqhCA1dYqWfQsEkzVLodUZwv3LeSHYKWRZL/Q1KOcKIJWe9Svr0ngIpu2Dyow== 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=FVnEv9myqOLt/CJ20ZFkyhajGwsGJFNREog/at225Pw=; b=QXTN0deNTDFzoxBzjsj1YAf31mQpxnOaE1yzlo79+8dKZJV5kJno87Oui/yQPZ9wCzwJLFH4kT9yCmbuD22jJqHl+TGxTz8lLttJIOuCgYuYhjUQq4S6ZdnkPx16iz/eX9iP0qtOFwdPy2RjsJ54iKkA3UiBfYBAfamvoxsIWP2tlq/zkI7beuAlJSCmncLwIjBgVHRH8aUb+lRXN2XEWoYipWMDi6vXwIZNJ5BUP/3gYM4S6qDu0un0haePaC43II14kz38jxXdtYz9SMPpX3IYVtuqySB8aUuHKVGsIsvKgPP2yTafFh4BVzT9nyInwiHuxY4DCWsoXNyr8FhVKw== 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=FVnEv9myqOLt/CJ20ZFkyhajGwsGJFNREog/at225Pw=; b=HUN58EHSx1R+V6h/jzb+0Fev6oM7WQ24F5NgRAndKUnF+gntcVmIf8tKErS5kczhV6DH+Pj/vdnm+id4oxo9TFF0KsyTlY6dxGO64R2PDW5NZtpkCT8oSa/bdmbL+Zuyf3ER/MCI1SLafvvySV2OeYnQb0dJ+eMrthxSkjBYb48coQ4sL7f5tiTYA9B7ftSLKmKQQp9lmHw5OoDlt+KmdQcu5X8UhUogu+yHBG2Bgb1sfcD0tLcBc2FiyvfCVLHpzNuDbxTAzI51pRo02xr0chQhLz8t9A4qnSw4mU3ninwDN7y1oDPPDU3MJ9yvSMGA8+litWOkoWlsQCGhu5cnMA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB4P250MB0734.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:37a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Tue, 27 Sep 2022 01:47:30 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Tue, 27 Sep 2022 01:47:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Sep 2022 03:47:29 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [Jg+F13gsVjNVmVgx1RTwss4MIX1RlnA2wVe+Q7D7JAA=] X-ClientProxiedBy: FR0P281CA0121.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::19) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220927014729.99088-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB4P250MB0734:EE_ X-MS-Office365-Filtering-Correlation-Id: ae85e8f8-2d10-46d0-d08b-08daa02a3d3c X-MS-Exchange-SLBlob-MailProps: Z9TzpHVL8qr6cfkin1EGqCzGGitqosE1kuVK3vA9uloOxP/ghxhMSiG4U5jWdCdSHZMn5a+IGHWTYB2xpoVgiELClfQEVFRlvDnlVCOgEsZ+M6o+Cbf45TcKOUo43Qkc3D1Bm3V9uS5verf0tDtf7vaAgh29yOSqTI4v47lpK03NXRU5AwYLCgfqzpmRcmUWvuaQOh00IgXz9t5LjwhufOxmeXz7lUmqG2S18N5dhTWUoI5ix9IzUY2ehWhgfyWTW3lmPEjLCiW3UNQV9vD9FEgF0nTW6iUsjDrKJFGAEtAXCwNsEgBWVoWAlskkFYk3DG0DVWZAU6k8w9Kyf4bj9Z9e7gaBB09MSbUCUgHy32vnwZzQQ820cLy1yAjP3PLqZn1a5W3Gr3gKqvcIr7eSwdxYw3QGL18Rujm8mnWy3HG1cuiIqs9tLQqm9pgeTEwbM3i6I3ASSeo9O3HBPQeRiDDIKvEiJFnXMGku0+c/4jK2f74GT4tZGyKovwSb8oa4dDpV20safSOEnPPEr0kLADpAvK3aCs/AnAJ3uBXzXA/HmP1CyhCDs4c87Ou4n+7OmJ+3/cBR3hYh1OE1CDak8BzFmf7vv3FogDNAsoqB2Reu376hXDGZOkTquxKOeQiIChXSkUmFLgf9REv7/RVNVNjR/s2Qi6B/BNUEtBxC5RC3xtiiDLqRClr7pfRQ9o2QhFxUboCeKF6genes8VJwVKZfj+CjEsKF8jQrDAx4ODW1ls+V7MpTKv1J+YdKdRpu2QVaG3jMwWrAr0VRfQfMMwDTqDXj79kLxcW2ZXq7gBHnRv7BgxMAi07adjz2q/+ULNcbJu7yyw5VkZO1lgiTEhKeYYR3sA4NeSgPrqv86k0bQ/D0O82npg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tgpJbQpUoGPCUYFWqF8nJYbT20A8rR0rrl/KbUQeVHkLYElc9Y5atxJPYblU+9fz0skVWFTmHkA45q+VHdtH+xiE8a8rFpsjt6mMnqHiyQxXDljfxdD3tbJuwSqTzgkAQzMThTRpeb39aA2Sg8uF23w2mYlQ19dgZ2l77WS4buzCqoc/Awgv8MzoyF5cRcHZYRM0l3KzZu3MVzzfpf2KPW8M1AtKopGyYZNxuIkEmHj3x3GDTa1mF6SW3LtLZMeJvwznGTASdoiw51z/hEIB4mq9nJbWyC6gZ/yuszwyaAKuhS+CFzVB9d1FtV6DxNpFiINH4RnSpoq8/7J8kmxHhROKtT+SIKScjx5o461JmN4dw8lG3xXhxc2Mm/FUaUj0HqYG7v5ikLjrCofRSNnOkJFc58x/ZcPd/oLo0he+fiwactZyA7j2qbMwFduBbsaY/nZxAU1C3I38X8g4NcnOmP3F7v3da3wpfPAh1GPZ4AhFwQI6zaAjgwQOUi5Bij6MvKOc+cSEHSRBklWCOnD9sF55nFU/9q8C3kTr2q8RdHT1tEcgVMZ2fHEwUARonugABsra5S2fyR+GrYabpMZYRT2BjiYbg4JZRhARXnU1IB8+Xu9v4t/vEmIeE6lPodfAhkKbDN0XfDOYkY5zE+mT5Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OJa0cshfrTZrcIFQYk0SSng5P50sxLvDktrqKXjzIMXmO77AOq71j1/XEG0qre4atbMunpbqBU0L7PBrCwqYRPjMtWbVB3i7jK3eh1n7ASjT/MLntADSTTcvSXMJPeu0EqEYrOPltgK+B/b0RzE3KvnZwCX8G+1q9xzv8TolEd4eSHap1OfieXLyrSDIDbRPIA7FfWG3m/5KNNtFX8Kgcjh+UAjzT9njy5nn09HJ5QQ+Xgp7uC6EXWQE7sj1DSK0vSa/4e7r6UQ2f2dMQpormCFb9+xuLwSjCJiX6agz9TJVxnLaP99Zdtgp9lkOyNLush9HXqLzcqk1/KfH7ON1PH0OG6dVORAfpa35jTVCrp8gHwUdLzx8N5YuLjmaNEk7LzVaeOzt5vRfxGgu9NL3yGwxGHbQS2xJbl+Hvls2cUV2rfktFknW3orFOLCUBfdg6kH8wdZ3UdhRv9ogN5KHmPB9UkB8I0hsS4ku3KyEwvBaNCCm1yiaPz1TEI65xc9coeH6n3ftf8pR0wYj+bmq2Tio9IsXFpaSxBHZyHvyGviaxvypI095ge+fqhdgkwiDfqn0FrScDNdJaxAESsgTXvt7hxYVL5PqZpfgGflUzbWaPUbQ2CmY0GUUoEni4uPoSEErTMRGv5WgXfITnG9ns4tkN8GuCHhZNL9biT3eQ1WRThP1BrB9HDX1g2+zvY7oRtI+tW+lnwyCNLYjM5QEEcb8GT1eBAaX+Z7P00W5aeLA67aHZC5M484GEX+ve266EK5xZQw1ENwqb1K3j7lG76bQGPGz9YqpPAg52DjG8smK6y3AKkcb+ipPfVJ/H7vaYXDYJkVXClaE9VbFdn6Hkc1aHeKwwCzi76Wyc6hoXgvcrMFKWeNYzUTsOfp/5j8h0AM4Ox9K4XIrR7KkS1zO9LFSZQE4Xu7wC1WP7kj24JKVX+X7cES9Blfq+JKO8YrL5qGeZ9C8rtYfWMT7QWZKwrQ7RXku27dt9txaIixtvN6qC2Bnjt+NZvRv6bUpNyHh1Bii4ZxsVkgrtFkzrtk+AEc9ZchgrvITJrYLW7cy2jvWw4rYYsneGCA0O72cJXOA75kSdWZD5wy2/wWWoN+1FIgdxBipCzD5GVYcA46iUHiNxZHzGitIEX3TeXvxMV+1/iwbFqweMPHvLZfgmORBAGG5AAxLDSRMfAy9TRiNJInIYykZ52FDX56ExWzGK823xUgFpjGxit5RWTzcUN2OdW8vybMTA15iOTdKILWLsVX3oU9WntoMnUfFMIwrByHPSn3SEqjGpGSirqUacHXfg/6YYsqjqYHcyH5vjwtGvvNd58rbbS2U6712jeYNejc9 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae85e8f8-2d10-46d0-d08b-08daa02a3d3c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 01:47:30.4999 (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: DB4P250MB0734 Subject: [FFmpeg-devel] [PATCH] avcodec/jpeg2000dsp: Use unsigned to avoid overflow 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: u8tL59ucLMGV Affected the jpeg2000dsp checkasm test. Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeg2000dsp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/jpeg2000dsp.c b/libavcodec/jpeg2000dsp.c index b61be3b72f..b1bff6d5b1 100644 --- a/libavcodec/jpeg2000dsp.c +++ b/libavcodec/jpeg2000dsp.c @@ -76,14 +76,13 @@ static void ict_int(void *_src0, void *_src1, void *_src2, int csize) static void rct_int(void *_src0, void *_src1, void *_src2, int csize) { - int32_t *src0 = _src0, *src1 = _src1, *src2 = _src2; - int32_t i0, i1, i2; + uint32_t *src0 = _src0, *src1 = _src1, *src2 = _src2; int i; for (i = 0; i < csize; i++) { - i1 = *src0 - (*src2 + *src1 >> 2); - i0 = i1 + *src2; - i2 = i1 + *src1; + uint32_t i1 = *src0 - ((int32_t)(*src2 + *src1) >> 2); + int32_t i0 = i1 + *src2; + int32_t i2 = i1 + *src1; *src0++ = i0; *src1++ = i1; *src2++ = i2;