From patchwork Thu Apr 28 03:10:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35454 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp3343046pzh; Wed, 27 Apr 2022 20:11:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDk2Rt9llMoqdcLvvxCB4eAy/c0faa0C4DSbZ2qMUPQ0kEUTsNuaupXXPG8l+btUoOJ90N X-Received: by 2002:a05:6402:3d3:b0:426:12cd:ba78 with SMTP id t19-20020a05640203d300b0042612cdba78mr7879410edw.161.1651115487905; Wed, 27 Apr 2022 20:11:27 -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 h15-20020a50cdcf000000b0041c9d2011desi3126962edj.518.2022.04.27.20.11.26; Wed, 27 Apr 2022 20:11:27 -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=Qa1GqEV9; 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 7CEFA68B506; Thu, 28 Apr 2022 06:11:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072018.outbound.protection.outlook.com [40.92.72.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B7EF468AACC for ; Thu, 28 Apr 2022 06:11:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jK4s21z+p27Y68ibuaeqLH+iUq3DYaf13oxYAitbfQSqT6oa1p0mvYZr3NhuVQURoJx+7E2aTQ4uqhovdmuHyjXgYHhnVPrNpneNYtIUHWIeflxTWDKmmmQxYIh+RWwmuIVQ8VGlgialmu1LK1P1TbapbJ/dzBlsQl73atncbcOZof1OBTq1uLK9jem/sePa7AqcmS3iAcwjZMGWgTrRRKzyGBHMCmoDimGv3c0jg+SNhwhXU3FB3uIQB7K8hBSyOGQ5esWhnyC6RQZAlVmqW3v+U56qSSTLx09BLjFnsrLaSbAiObkSH4mEnM1s5pOblO+650D0nMqdYhOB5JMeeA== 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=qXe1Id8ADRhZGTTFUnSnyt+/tL94pckyxSYbsiYoSrQ=; b=hydM565c/gOpPtBYTtLvxTsfv/cCFs8BhC0rLGJ7koYxAbCqQNUztLmiKV2cDozi8BFeapX3LTZFxnHFZ01ZDkcGD60+5Z+Vb4vuVzOO6pMW/7hk4VopSuNRntgmyREr5oYeZlBg8vr0WjRCoLdN2Io5t1KkXEX1aubAOTBd15YoUodpT+LgZH1bM8WIU1ICCSjKm6VJo9oAQPO1N//wl2cdd5sqXbO2sqWjTrukt6GoAsp9npxznQ9knjdNhpjogwJwLU9iR2Flb/rmsovKkdMR+yrMH11YTmLp3fVnjQEgFqXOvUyd8H5mj6m+MpHohMlYqXKwDDoGZxtZfsxl7A== 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=qXe1Id8ADRhZGTTFUnSnyt+/tL94pckyxSYbsiYoSrQ=; b=Qa1GqEV9e4szIAwvOC+h9Q/0ZLHUCq+3cUOZdHudbyQuavDa48voH+BMlTPqMcCnEtNF5Z1AvBCYlE1F/2iO4rpdWvcwLAyxuz5B05MiliTVLvqzKD2Jzk5iBOSEDFTHtSrUyEuknZ+X6Itx/F9l3pGoxP3LtwAoE2Yz/sixqAPAvO7/idtTH6uPOyFjrnooMfKk8J9wXqWmdr8S1MEtFBx8/2h0tz2h2t+S+a1Qwv5acN7Ts1q3rfIBLTWtpZBTkaL7S0hPFIFcodktIT2hUZIZPfVAMcCh55LztflqMr6AKsmIdKJzjAxL4KxVJlxrDv+ND7phr6TCQs7maONZqA== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM0PR0102MB3316.eurprd01.prod.exchangelabs.com (2603:10a6:208:18::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Thu, 28 Apr 2022 03:11:14 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5186.021; Thu, 28 Apr 2022 03:11:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Apr 2022 05:10:55 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [8lI3yEMpVZA+Iclgbt+WflW5WO/8TT0r] X-ClientProxiedBy: ZRAP278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::14) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428031055.359385-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa30e46b-0af3-4417-d73a-08da28c4c0ae X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSn/Ac67ugue1dNyaFF0mI1orkj9cCdqtbvBFEiwbNBf/IEv++B3cCSc39sOkM96R9/u6Z3AVmseEltdniflNZf3616sa/qtj3WsVv9voxkblwKXTUqcarCPkgqOB9faGCxbn0akpwC7yHUEZBOU3v5Ffqd4aqwRnWnFm5dXIGgx9MFZPMcz20jvhpryrCk/k83iPyig2c4DlUAm98buDYAWjmTthXMRnqvYQNl8kSy1fxE3EH3EsRlPeIvpDvdg6I9i91qsesBnmHMO1xih+6RVnExi+Fm0y22OlAg1DnW1sZwBE5eB/gYM/0pC7dX2/Bth3erNx9Jc1hrB68iCciOTMWjBKLgxJ5jRRVTBDSMaBL5DRLgda+QoWMlGkL76KUOqRwB5J5om3uA7VnLV3KeH11aBhRi4OT/ikcpa+DiZYX0jZb3rs5OMw5XuGNOXEJboklFhx6so8naWS81EEyWJcEz64AVlTz5xszvuv5T3ET4BnjGUstUXweZmqupxaiECurWM5nFFJ0lIOoSh0XbQffl3n3GCZr3TJKYVnLh0QTMqtXFLw3P9helMeEb/2iTxtLDCAbOPqefFldhzwNLLnPTe7syV0UjrZeynPjhWZEReCqwJBH+a+4kE37+skQDJffbB1JXTqCfx3lgLDCa6yWzRhcwdLJqMsIe1RxhhPbto6lExNQfBzvlQmzhfdVmPEyrinHOiMTeGAuwsYIo2sBtsvoL63fNdG4pBPRMaV7vALipIhp5U5AlxVoqvKU= X-MS-TrafficTypeDiagnostic: AM0PR0102MB3316:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4ZcrivUK/haObSDzi4sdVfdQ0+TInhG37GpHivzywZUZ7UdNEYSIIryYGZcQNFcFoGAYf15T+Dk9pKL1klELv9cL2OwUrd/JLuzPrCKGMrx7xMnwlwAYtAUAYgkbOvCeWHiceXP3DkXlK0YJTmoCxOwEkM7++AhT2DFTiO1otPo46v1Rvk1d7qdcUZfKlBpGoXYwxl0jEluI3UEMPuantHdCAidCTTdyBMhuTYoFRw0PEhfuKBcwGksZi4Alo10M7qUdfLcqECB9nBucupFmcMakBnk4and2BX4XTFCRkJjzSjOkuDqFBllcmEc67ST5izn0Qlyar6nguVX3VzAzikCdAzb2FEMzX7iggJWmoK7HLFxEGzAM2oo9vOn3ZvjHUNeWCX5khWRVvl6zcFwyJ2z3iS//8Yu0g4firDdljKLQgufRKWACw5HOin1JAJfwTVGxZgvqACVZTmmXSDQh6ep6sC1RlTqKIeBKCO/wb1MmC+sNp9GOmKvY+IUrJ2379k0I7f02+tMMn6TYeV0AKPqBGLquNyExOm4pQW/ZqbxX5rxhIzC21tYEQWyP4qls62qQ6TV8OsNuWz7PTW6bQw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J79e17EpYmVukqx8ot0SIAKWR85xD+hbTRQXpkOxMcwOJvyHDsgIgopy16zbERsJqkyXDbDJEUSrEU74jf7ldaDDuouPtsZPVDPJ4e+RLLPHa53wgqU9oAoxAfXG0VWTS512TcY1kNK9YzDPbXtLUDR3z6TfTqFG/8gnhUpVQ9YCXpYrTZlw0J2Tqsbeol4Rtj8bi+54321ByfmU2YKNJ7zQwFfSMcXpD0vGukaBBrh6NWBIQRzzuoppK2j9vztQC7yUW+DZshSlxx1qRi8SAqb7cCd2jIFwrU+pvoBTl/zWHrJrp1bGKIePzGpskFJ5rt6WodKz/YA7nH/QNfTHFPpcotpj6jrJp2eBAilmNQFeR2/KHcZJzWeSUqXUmEIe455k28LGs0gXZlsohRY/hUrufpn8JbOdamI9I+MNRk/i4lyO0+xcWy8PSQHQ8eHxrOvrE9xvdt63hzpvZX5pXIrHO2AK4WOI3iCNyZiJNt+ckhHt40EYjZeYFwxTWKiO/X6rMZUkV5/f4p2X1NTOhzOMxbkr2IWPynEZCH+mDnNxfWrxBMaRJvY6J1GfKY5EpxI2/qreJDAc/yH5WXC4GYIVAxKA6H4/uUdjOy29AkYLDUhQGJ5+efxR7C/jzEy9EfsFuEMoQh1h8fYzmZtsU8P1A3qM3HQUgot25jQ+WlmkaKQccpIeQ8l9PkTNmpSlRRIvUy3l1rm5FLhqeGwus9RUxoSy/gushypX1A4k+KBosaU+Zp54wazyym7rUhIyrNm6VkUtB7pDFuAKLZzK7RvcV6SyPe/G31kJNPZ4tW0AIjBzPd2BWABN8TLQsHNsNVkk7xzfJ1Ff/MLH2qVauei/f7Z6YNw+I/cfwRal9BbzOh6PvONYmKjasNhe9kEUKKOO9Trcg01e29v1XeEMugQnymn+McD6ayEGvVupt/pOvm51WK0LRxKSXnYAwDdmJ1Y01bBA8O0jSiRJ7Jg5KT0M2DixlvqBCdJlpVaEH3oW96O9RDX3y8QSGSHY7vIe+Muypm6zJayGGrw5A11ChPV6Aq8q3KAT1CBGrbqLUzZcEqKfTzN38tR08phIKt5ac3dHRqK2qFHVN3yKImo2m6RiO2jLWCKmO0UCYdA06NVr8G0K/Y3ZBY7eDgYKG85H9iRnOppxzzKxBro1Ukhe3hFCEUhZ5TgXHmTWT+Qb/uShBHHr/6SSmU0oT23ntbIS4CAWUSgma8FEh5I/0mGf+2Q6EZgzGm6AV4htGaHgCbxx2zjq727pPRr4AqVXZYwsilVDItkf5xnNPIWfHZQrbHJ04CXacQDlvf+X31qeG3d4NHRvkXvJrN7E1N7/NINjnpDnuQ8StBQ4HqKKhUk2jOBLagLdd5lY9PZUYlH2+wIDLwpG3RwNns/Y2O3vT4DfICvvMfEEFWExpVHr3Huqi6EfvokFANMFQ5t1KLwy9l19A+FCPbNaL3DkXcsG/j+F X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa30e46b-0af3-4417-d73a-08da28c4c0ae X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 03:11:14.2105 (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: AM0PR0102MB3316 Subject: [FFmpeg-devel] [PATCH] avformat/jpegxl_probe: Fix potential incorrect and UB shift 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: xyjGL+uOKSsN Fixes Coverity issue #1504273. Signed-off-by: Andreas Rheinhardt --- libavformat/jpegxl_probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/jpegxl_probe.c b/libavformat/jpegxl_probe.c index 924b529ad5..9cd00da194 100644 --- a/libavformat/jpegxl_probe.c +++ b/libavformat/jpegxl_probe.c @@ -96,10 +96,10 @@ static uint64_t jpegxl_u64(GetBitContext *gb) ret = jxl_bits(12); while (jxl_bits(1)) { if (shift < 60) { - ret |= jxl_bits(8) << shift; + ret |= (uint64_t)jxl_bits(8) << shift; shift += 8; } else { - ret |= jxl_bits(4) << shift; + ret |= (uint64_t)jxl_bits(4) << shift; break; } }