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 A207A47A8D for ; Sat, 30 Sep 2023 09:39:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4A9968CCD4; Sat, 30 Sep 2023 12:39:42 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A26C668CC46 for ; Sat, 30 Sep 2023 12:39:35 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 06A21E957F for ; Sat, 30 Sep 2023 11:35:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eqgH4lylCVz3 for ; Sat, 30 Sep 2023 11:35:19 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 9B264E8ADA for ; Sat, 30 Sep 2023 11:35:19 +0200 (CEST) Date: Sat, 30 Sep 2023 11:35:19 +0200 (CEST) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: <20230929232001.23197-1-michael@niedermayer.cc> Message-ID: <47b96a8-db6b-aa20-d48-a6d60f0e84e@passwd.hu> References: <20230929232001.23197-1-michael@niedermayer.cc> MIME-Version: 1.0 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-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 Sat, 30 Sep 2023, Michael Niedermayer wrote: > Fixes: signed integer overflow: 109817402400 * 301990077 cannot be represented in type 'long long' > Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_AVI_fuzzer-6706191715139584 > > 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(-) > > 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 = s->streams[i]; > FFStream *const sti = ffstream(st); > int64_t duration; > - int64_t bitrate; > + int64_t bitrate = 0; > > for (j = 0; j < sti->nb_index_entries; j++) > len += 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 = sti->index_entries[j-1].timestamp - sti->index_entries[0].timestamp; > - bitrate = av_rescale(8*len, st->time_base.den, duration * st->time_base.num); > + if (INT64_MAX / duration >= st->time_base.num) { > + bitrate = av_rescale(8*len, st->time_base.den, duration * st->time_base.num); Why not always use the AVInteger version? This is not performance sensitive as far as I see. Regards, Marton > + } else { > + AVInteger bitrate_i = av_div_i(av_mul_i(av_int2i(8*len), av_int2i(st->time_base.den)), > + av_mul_i(av_int2i(duration), av_int2i(st->time_base.num))); > + if (av_cmp_i(bitrate_i, av_int2i(INT64_MAX)) <= 0) > + bitrate = av_i2int(bitrate_i); > + } > if (bitrate > 0) { > st->codecpar->bit_rate = bitrate; > } > -- > 2.17.1 > > _______________________________________________ > 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". > _______________________________________________ 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".