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 38C1F400EC for ; Sat, 30 Sep 2023 14:04:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 956B368CD04; Sat, 30 Sep 2023 17:04:13 +0300 (EEST) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EF0D68CB58 for ; Sat, 30 Sep 2023 17:04:06 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9398BC0006 for ; Sat, 30 Sep 2023 14:04:05 +0000 (UTC) Date: Sat, 30 Sep 2023 16:04:03 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20230930140403.GK3543730@pb2> References: <20230929232001.23197-1-michael@niedermayer.cc> <47b96a8-db6b-aa20-d48-a6d60f0e84e@passwd.hu> MIME-Version: 1.0 In-Reply-To: <47b96a8-db6b-aa20-d48-a6d60f0e84e@passwd.hu> X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH 1/6] avformat/avidec: support huge durations 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-Type: multipart/mixed; boundary="===============6905010762597025571==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============6905010762597025571== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ENS8W0Tt0j5TmTCM" Content-Disposition: inline --ENS8W0Tt0j5TmTCM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Sep 30, 2023 at 11:35:19AM +0200, Marton Balint wrote: >=20 >=20 > On Sat, 30 Sep 2023, Michael Niedermayer wrote: >=20 > > Fixes: signed integer overflow: 109817402400 * 301990077 cannot be repr= esented in type 'long long' > > Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_AVI_fuzzer-67061= 91715139584 > >=20 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz= /tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer > > --- > > libavformat/avidec.c | 12 ++++++++++-- > > 1 file changed, 10 insertions(+), 2 deletions(-) > >=20 > > diff --git a/libavformat/avidec.c b/libavformat/avidec.c > > index 00bd7a98a9d..cfc693842b7 100644 > > --- a/libavformat/avidec.c > > +++ b/libavformat/avidec.c > > @@ -27,6 +27,7 @@ > > #include "libavutil/avstring.h" > > #include "libavutil/opt.h" > > #include "libavutil/dict.h" > > +#include "libavutil/integer.h" > > #include "libavutil/internal.h" > > #include "libavutil/intreadwrite.h" > > #include "libavutil/mathematics.h" > > @@ -476,7 +477,7 @@ static int calculate_bitrate(AVFormatContext *s) > > AVStream *st =3D s->streams[i]; > > FFStream *const sti =3D ffstream(st); > > int64_t duration; > > - int64_t bitrate; > > + int64_t bitrate =3D 0; > >=20 > > for (j =3D 0; j < sti->nb_index_entries; j++) > > len +=3D sti->index_entries[j].size; > > @@ -484,7 +485,14 @@ static int calculate_bitrate(AVFormatContext *s) > > if (sti->nb_index_entries < 2 || st->codecpar->bit_rate > 0) > > continue; > > duration =3D sti->index_entries[j-1].timestamp - sti->index_ent= ries[0].timestamp; > > - bitrate =3D av_rescale(8*len, st->time_base.den, duration * st= ->time_base.num); > > + if (INT64_MAX / duration >=3D st->time_base.num) { > > + bitrate =3D av_rescale(8*len, st->time_base.den, duration = * st->time_base.num); >=20 > Why not always use the AVInteger version? This is not performance sensiti= ve > as far as I see. We can, i will have to fix the rounding though so it matches av_rescale() [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Let us carefully observe those good qualities wherein our enemies excel us and endeavor to excel them, by avoiding what is faulty, and imitating what is excellent in them. -- Plutarch --ENS8W0Tt0j5TmTCM Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZRgq0AAKCRBhHseHBAsP q6ZaAJ49Btm8A9dBaYSw/W5KWC0qrC3+2ACcCijKeZyC+nCf2v6mbjAhBG1I0NI= =Yk53 -----END PGP SIGNATURE----- --ENS8W0Tt0j5TmTCM-- --===============6905010762597025571== 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". --===============6905010762597025571==--