From patchwork Fri Sep 29 23:19:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44038 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp97643pzf; Fri, 29 Sep 2023 16:20:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG4w1MrPzmlOKMIMD68WMUirrb4+JwOtDd6iZpKrs7r4VD77k8YwQswztFdH1LvyKvOr898 X-Received: by 2002:a05:600c:2145:b0:401:c338:ab94 with SMTP id v5-20020a05600c214500b00401c338ab94mr5511084wml.29.1696029615571; Fri, 29 Sep 2023 16:20:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696029615; cv=none; d=google.com; s=arc-20160816; b=Nb577f0p03arnevgWJAgJlOKoCFXIsEgAY+tQqbPuxVwKGvy9UX8ZT0GfylFIkH1LM QMpPlBCNUyzNnzuzufQ853fqbptstKH9sgajA3eHk6cJKRKRF7KaPHLNHGFTHuj3ob43 7jlmaxnbisMfyMO1Zx+XUYq9oKVy/k3/E/IOoc2+jZ2GsZAXJ8qJUk2d7iMzSpHIOkqt b7OFYEal+M+8fRSVLolUQz2Cp5Dv72Bd9nOvc/CPsLbmlIkJO2JNyjxeDGAWMW6dHFIu tk41XCp2JUxU0fZn88mWbSqDom/CTJey+nqSsndAlBYV3jTuo+9HO5EIzZOwsHDW1f+M tj8A== 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:message-id:date:to:from:delivered-to; bh=9spzv1va5Zy7/i3d4ddrzvqFkmLthZA7XhU5cI5eZBY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=CNXC2iXPWVqQ4pUDBGCIQH56GwERKwpfr0gElF8F/h7gvRln4hzXetX/LIpVYgSz0r ucKVtIaIhN3lCBpZV4nOuAK4Tr3azHgD5qvsk3KJhSrtLmlpYt7cTIDlCawQuPXzg+Ub ohlHcG4LXhV0oTq5rCoGXIu2QFpZR5cnQDDIgOSxixG0sPDgNQ7uHOSS8abUl/3uKVYM jGh+heGkPTHsOb59hqtXGmA5FHNkuDgR9VXaf6LhTmIsg9fxnBMUpk2sc7oWmWCF2yD9 +APK3/RCmprdElHu97FBAkYh+EzDMXTL9ixMdCB+K/bbC+Cc5UqKkIab3D+77JQnRbbv 3XpQ== 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 l6-20020a170906a40600b0099cc50f304csi17636559ejz.291.2023.09.29.16.20.14; Fri, 29 Sep 2023 16:20:15 -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 229E768CC95; Sat, 30 Sep 2023 02:20:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9255B68CBDD for ; Sat, 30 Sep 2023 02:20:03 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id D700C240005 for ; Fri, 29 Sep 2023 23:20:02 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 30 Sep 2023 01:19:56 +0200 Message-Id: <20230929232001.23197-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-Spam-Flag: yes X-Spam-Level: ************** X-GND-Spam-Score: 215 X-GND-Status: SPAM X-GND-Sasl: michael@niedermayer.cc Subject: [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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2ekbX1oqdi/j 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); + } 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; }