From patchwork Sun Mar 20 23:30:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34871 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1218614nkc; Sun, 20 Mar 2022 16:31:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyofAv1GYFjVimOpMWWeGzclONgxcQNks8Oa8zsPe3ftTfGFzprav+UlNRF14NALQ4R5EYO X-Received: by 2002:a17:906:3acd:b0:6df:f6da:fbbb with SMTP id z13-20020a1709063acd00b006dff6dafbbbmr4785637ejd.189.1647819081013; Sun, 20 Mar 2022 16:31:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647819081; cv=none; d=google.com; s=arc-20160816; b=0PBa50R8iTOotWAX6dkAo77+lxsLbd/I5tsdunsczkJJBa072WKc4VoBPhmNK+qzBi WYerTXh/NZA8uG7Ck4umhlc4DlUvNoN/umAmDx9jV/tTtvpz9aouhTDFHe1HvUTQ1m0B fj+3LLZ9YIgRCcVRe2inmi9txsBLvguM6/RNX0WMpN5pFOOSs1kvVdv3axJd4hJ1KWNy h4PpBHP530UtBPBMWbwa1WKDilRoxGGP2wMc1a+706HOq/hT6OuhBnj3yKanBMzKF9Ty BdDQQfOG7uuxFq35+7CiySYe8c9l0zPThu/28FvB6mHhgdpp1G9iLXuZ3ikBaf5bDqSZ 99Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=QVty06hPgM3RQbTuJpw4WEInD73o8D/zWiUrsDxzx34=; b=pWgGdVTVoqMaSAsA5O3+TUkm9e72jrBeRdxDqHMgIv+MXbvqkFKyQp0FA06qeE8PUV VVbgN8lmYsnc9+ZDo7R332iipkFS022iJJtA4VJ0MlZ8BLQ4FW/Pxv8vwfxw+iva0oHx pradCbBXRve4yD1kdvrMvVta51CXHc7TD4Ku3KgtVgWpC3USmJ21fWpcTX8JkXilWgyD 01vOMU6kYv/ddsrKgdkyVKn7/FHu75GOaZSJIpm4dqqMb91Vc1PXKLfr9pIw/Y2Rlsm8 VZCIFJFKjXdGCt2P3oxUeer5VmzA2PnU43NcO5ZVtOAW0zy/gJjiBaNUez04OwtTcpuG AzOg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i3-20020a50d743000000b00418c2b5be9bsi9571837edj.381.2022.03.20.16.31.20; Sun, 20 Mar 2022 16:31:21 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4AC8768B18A; Mon, 21 Mar 2022 01:31:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DD3468B0F6 for ; Mon, 21 Mar 2022 01:31:12 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nW50x-00097N-DE for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 00:31:11 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id W4wrnGGxXSgGFW50xnIvYz; Mon, 21 Mar 2022 00:31:11 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id W50inPQXLOPqFW50inIvAx; Mon, 21 Mar 2022 00:30:56 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=6237b93e a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=lNa9Xz6_rgQ0qIf7voQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 00:30:53 +0100 Message-Id: <20220320233056.18169-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320233056.18169-1-michael@niedermayer.cc> References: <20220320233056.18169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfFmN5NFcFlNOVI/iafCepqzTo732y/7H578Iy7ouBAg35DOGU9O3DCW36lvEZE+V/Wx3/PUeGe9AvSeOAT1/RstlNmO4GqyY1PfhWeOpv6N1YejkAlDF rWbwET7B3775nMC3WH8oA5SCT9GEQ9mNJDUk0MbwGMyBUDzf+cgx9+31JMjNuJHnpQ4TMLVqFHuVQA== Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/mlpdec: Use 64bit for channel layout 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5PvB1ZAbF/JN Fixes: shift exponent 33 is too large for 32-bit type 'int' Fixes: 45645/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-5651350182035456 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mlpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index c51e0fbed7..2f5de9254a 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -207,7 +207,7 @@ static enum AVChannel thd_channel_layout_extract_channel(uint64_t channel_layout return AV_CHAN_NONE; for (i = 0; i < FF_ARRAY_ELEMS(thd_channel_order); i++) - if (channel_layout & (1 << thd_channel_order[i]) && !index--) + if (channel_layout & (1LL << thd_channel_order[i]) && !index--) return thd_channel_order[i]; return AV_CHAN_NONE; }