From patchwork Sat Sep 30 22:30:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44066 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp598927pzf; Sat, 30 Sep 2023 15:31:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IErvgXtPVEE1ibPqE+YwE3AOcTYIdIDLHowPXpygbvPFDpV9RQcJpcmuKDgR8GWbvOpEG2b X-Received: by 2002:a17:906:19b:b0:9ae:4eb9:e09b with SMTP id 27-20020a170906019b00b009ae4eb9e09bmr7391360ejb.27.1696113099888; Sat, 30 Sep 2023 15:31:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696113099; cv=none; d=google.com; s=arc-20160816; b=UlcQ9WaKgfqNV/yXtpAGuB1XJBuvePyKM+sjZqKOfV/Kx2kZkkuJQS+QD/P40gWcYP vGgzbS88tH3gx93u5RAUX7vFmQo2rOIn9sjFozqvTjL/1lVjBPlUbRJ2VTn9hWW9Sjji ESGb+sl/IF9nOGscOhyyJOWaUgpJLZr/vDmH4J3rYzFuEuxwAF9aqJUIL/KVn2GtW44/ KMgjaz0RV2FbFo+N9uGr02i7nC1471t2lsSWhG9qRBck7GRKzEChjEoQMAEuDU10Yljr Fx0VmozXXIrmwBIsVaoXpmjxnLqxb44xujxh41hoNe7AAcqYx6hiIkkcWQ6gIWbA5ZKD d9VQ== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=DiIH/gozSRbwkBDcUBglo8DaU6gpAPjatbIQrjz/nPA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=CGhx7QCObIoKyIhHs4gGpVwPvQ5CigYodHHRDjjbHcSNZRarA1F1CZcNBstM0ziOfM B7bEp8syEt4x9HpuUcao+5otHX4FCNgJ+YUyNp5YTBY+s/0EspY7h30U6iy8gzBeuKn5 RRNdU6+lERGx5FDoveKFVziIQ8riWmrvgVEBXCcROyPBCSGzlji7Rvg599LzRSbvoZnm LGWaOIOcafk4Hv8BRy4bcki1SQNJgeslyNQzp1BiBLJmyHFt/wqQKEfbJGhE8kOqEuV9 VdVl0/0Kqg6icuAMdjKjf9C1mCb0MFSnfm1rY6g8R6SSaacc1J1luyDR5SmytzqPeXGj bCCA== 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 j5-20020a170906104500b009b2da273439si1689506ejj.884.2023.09.30.15.31.39; Sat, 30 Sep 2023 15:31:39 -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 DB4E568CD6D; Sun, 1 Oct 2023 01:31:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0F3068CD4C for ; Sun, 1 Oct 2023 01:30:57 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 332ACFF805 for ; Sat, 30 Sep 2023 22:30:56 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 1 Oct 2023 00:30:42 +0200 Message-Id: <20230930223046.22896-11-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230930223046.22896-1-michael@niedermayer.cc> References: <20230930223046.22896-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 11/15] avformat/matroskadec: Check prebuffered_ns for overflow 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: oxqlsgyYZw7/ Fixes: signed integer overflow: 9223372036630775808 + 1000000000 cannot be represented in type 'long' Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_WEBM_DASH_MANIFEST_fuzzer-5406131992526848 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/matroskadec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 941c0bcdc9f..ae8823ae58e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -4537,13 +4537,17 @@ static int64_t webm_dash_manifest_compute_bandwidth(AVFormatContext *s, int64_t int64_t prebuffer_ns = 1000000000; int64_t time_ns = sti->index_entries[i].timestamp * matroska->time_scale; double nano_seconds_per_second = 1000000000.0; - int64_t prebuffered_ns = time_ns + prebuffer_ns; + int64_t prebuffered_ns; double prebuffer_bytes = 0.0; int64_t temp_prebuffer_ns = prebuffer_ns; int64_t pre_bytes, pre_ns; double pre_sec, prebuffer, bits_per_second; CueDesc desc_beg = get_cue_desc(s, time_ns, cues_start); + if (time_ns > INT64_MAX - prebuffer_ns) + return -1; + prebuffered_ns = time_ns + prebuffer_ns; + // Start with the first Cue. CueDesc desc_end = desc_beg;