From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id F18C3425D2
	for <ffmpegdev@gitmailbox.com>; Sun, 20 Mar 2022 23:53:15 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A50A68B1C8;
	Mon, 21 Mar 2022 01:53:13 +0200 (EET)
Received: from relay12.mail.gandi.net (relay12.mail.gandi.net [217.70.178.232])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFF6B68B117
 for <ffmpeg-devel@ffmpeg.org>; Mon, 21 Mar 2022 01:53:07 +0200 (EET)
Received: from localhost (213-47-68-29.cable.dynamic.surfer.at [213.47.68.29])
 (Authenticated sender: michael@niedermayer.cc)
 by mail.gandi.net (Postfix) with ESMTPSA id 10F2A200002
 for <ffmpeg-devel@ffmpeg.org>; Sun, 20 Mar 2022 23:53:06 +0000 (UTC)
Date: Mon, 21 Mar 2022 00:53:06 +0100
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Message-ID: <20220320235306.GI2829255@pb2>
References: <20220320233056.18169-1-michael@niedermayer.cc>
 <20220320233056.18169-2-michael@niedermayer.cc>
 <75e26585-5621-e949-449b-6f1d21cc2e37@gmail.com>
MIME-Version: 1.0
In-Reply-To: <75e26585-5621-e949-449b-6f1d21cc2e37@gmail.com>
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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: multipart/mixed; boundary="===============4905550727887908152=="
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20220320235306.GI2829255@pb2/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>


--===============4905550727887908152==
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="u8xVL8dRKgzQVETR"
Content-Disposition: inline


--u8xVL8dRKgzQVETR
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Mar 20, 2022 at 08:34:32PM -0300, James Almer wrote:
>=20
>=20
> 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_f=
uzzer-5651350182035456
> >=20
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz=
/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >   libavcodec/mlpdec.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >=20
> > 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_ch=
annel(uint64_t channel_layout
> >           return AV_CHAN_NONE;
> >       for (i =3D 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--)
>=20
> 1ULL

yes


>=20
> >               return thd_channel_order[i];
> >       return AV_CHAN_NONE;
> >   }
>=20
> LGTM.

will apply

thx

[...]
--=20
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The educated differ from the uneducated as much as the living from the
dead. -- Aristotle=20

--u8xVL8dRKgzQVETR
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iFwEABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCYje+YgAKCRBhHseHBAsP
q43gAJdbplU31vb/YziBe6g5egytp21TAKCDibck4AETYTgU3SGqfW5lzqDa6A==
=4z+E
-----END PGP SIGNATURE-----

--u8xVL8dRKgzQVETR--

--===============4905550727887908152==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
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".

--===============4905550727887908152==--