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 9BFCA425AF for ; Sun, 20 Mar 2022 23:34:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 74AF468B196; Mon, 21 Mar 2022 01:34:39 +0200 (EET) Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com [209.85.161.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B983E68B195 for ; Mon, 21 Mar 2022 01:34:32 +0200 (EET) Received: by mail-oo1-f53.google.com with SMTP id r6-20020a056820038600b0032487f52effso3426686ooj.3 for ; Sun, 20 Mar 2022 16:34:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=YkmPaZ/FPG6wytHheLLYpsBWNkUMVrsh7rpoU5dR76o=; b=KyhMzR51/61oE39WxZNl9nr0aQ8rkYsRjgol+DJa2MRBud7320vlnyvrj8aGmUyCQb up2GeHCjGBWHw+i2HoQO+VPzDX81AYGid9yCpOCLI8Wy8cB+I0oq/R4ebCSdkdrfGjeS 37N8qIgep0pg4AcgArxm8hIT/V1pnv3fH0EweVt2jzYJGRrTXQMQgCTJCiNOoWlztxqZ WpdwvPLlF6PRDuxGhlgTfvK5bTHg0wkswD508E/6KGHct9tvL4Aeqypgovyxl0gug0Xe gPkd2CtLZ/qVkPo+lIxwghdJP0e1W7C+EYsfkVpEtvv1SWJTWwquEy1PzulW6xX/wWdQ jliQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=YkmPaZ/FPG6wytHheLLYpsBWNkUMVrsh7rpoU5dR76o=; b=LDy5TM5TXgVUATuTEjEZzAf106iELEhBs5HI1Pt9wU3fticJ7E2u6YQ0FBj8cZ9EF9 YsarFfCFdBrA1P06DcNKfHSNpGPzMKMSlQD6OVd12NL3v/+DQwKGgSU640CgWFJp1Hxx X9H6tG4aofeq6ZKvoAOPer+6MiM6QY4rsJnrzSAV5i9YtPFeXW/snwGuylJQjuEf3e4J jZWHhvF5rtTVtZPzGz7ZswpWqa5JWWfIl1SwmMntOSnzq/q92hNaAlZfWCcV3F8jyTms 31+DAVv1RMCWB5xY2VLbJ2niWRP6JNX0ru2Hydup5gW/ebi0D3MH2HoSOxC09MNpXFUj LxJQ== X-Gm-Message-State: AOAM532LEYcSp76fRzuBopNcqKCo/EuCESoh9l8C7/nvr3AYcUZGnUle V0hShAvb5m76ns/6ngiiY1snz95/gVMq7Q== X-Google-Smtp-Source: ABdhPJzjvr4mtffG6+765yRJR92wG7Db0sN2jcb91L53oEBtDyWu2BbGY82AuR3/vNecRBawWah0MQ== X-Received: by 2002:a4a:2f0f:0:b0:320:f7cd:58d2 with SMTP id p15-20020a4a2f0f000000b00320f7cd58d2mr5808551oop.85.1647819270988; Sun, 20 Mar 2022 16:34:30 -0700 (PDT) Received: from [192.168.0.13] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id l31-20020a0568302b1f00b005b272c60230sm6927866otv.40.2022.03.20.16.34.29 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 20 Mar 2022 16:34:30 -0700 (PDT) Message-ID: <75e26585-5621-e949-449b-6f1d21cc2e37@gmail.com> Date: Sun, 20 Mar 2022 20:34:32 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220320233056.18169-1-michael@niedermayer.cc> <20220320233056.18169-2-michael@niedermayer.cc> From: James Almer In-Reply-To: <20220320233056.18169-2-michael@niedermayer.cc> Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/20/2022 8:30 PM, Michael Niedermayer wrote: > 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--) 1ULL > return thd_channel_order[i]; > return AV_CHAN_NONE; > } LGTM. _______________________________________________ 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".