From patchwork Sun Feb 13 14:40:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34263 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp4788023nkb; Sun, 13 Feb 2022 06:41:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxstnzqGKEZphnF5h/EDmEJZC6550arV9Q0y58rO+fY2MbAlf1mGn09iyu1jJGrUm7B2mm0 X-Received: by 2002:a17:906:74c4:: with SMTP id z4mr7012729ejl.610.1644763275156; Sun, 13 Feb 2022 06:41:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644763275; cv=none; d=google.com; s=arc-20160816; b=1LqY6+GM980FKGJ80pbED6uV0MAK5RrV0VjFgKikEWCDdjobeehp7BTgxyoBigZQ6i 98LijmVezWGePVf8YNF7bk8eIvTV1aptqlTjRb9c9s8lPfMJRfXzCK6u4O3Qln5B3saJ 39Baba8Ovx88wU3NgdaMfEjGQeQKbodkahwwSltQiiLYpB6HywYEdnRM15/xKeXPYqBE ZzdekrlMr0M8jMZAaEKFOD6Wdna+d2Jl4H6Rw99iU5Z8dZ1+opAkpfAwm7JaO/B66gTR Ia2Y6eAAINgAQr/T38cnQVLkhczX/GKHlvq+KBpP8xF47Iyjget7+DAZu63ljlb8a7cD uouA== 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=8KupG7MwRWJvsRg7UwFozPLb0TnxT1VymRhSfeUyixU=; b=tckbn/53p5aoqsR4sihjXtdlawYW07s9BT/28Xv0Rzd3vdBYCFB518Qud45wF6S0uP Pl/OPnl5YSL8zCzgHV3QswaJmr8pwE5JcGKr1ykfsp11JpBAtYf9yNpdn5CWX/YIAm+0 rjzt27zhaFOjZyTpC0/DteZ1HysbG5JIXXE0v/+l1QL1b6I/CT0PYOYafhAa4DNpuuHo fsAnq1Bhs++QfYNyAm+Pok4Me7C5NbgTEspN7T99tRFaxjO+lBA10Jbgd4Ljx9UA5cPJ NySjpNSDpP0lT2TQmoRLP8KYsZR2W20LLiSo929mk+fj+2bAyfMrXdKXU0N3mECFZZeu edsw== 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 11si18852202eje.487.2022.02.13.06.41.14; Sun, 13 Feb 2022 06:41:15 -0800 (PST) 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 B198B68A7ED; Sun, 13 Feb 2022 16:41:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4C7068B0A8 for ; Sun, 13 Feb 2022 16:41:04 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nJG3k-00DOhz-0A for ffmpeg-devel@ffmpeg.org; Sun, 13 Feb 2022 15:41:04 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id JG2mn42OKSgGFJG2mnvObz; Sun, 13 Feb 2022 15:40:04 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=YePLpZ93AawN5t_7vBwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 13 Feb 2022 15:40:04 +0100 Message-Id: <20220213144004.4230-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfE3NwvnSLE24MqECJzOTfxa62OGJ+egrqlDQcR0fZFSDwZHUEKyeWFsC7SqXl4QD2WqGaVEdNOngIS+/AihA90n84yJizU8RE3vfujQXS5/tWaztrEmG TsF16i3r7Qv76lVAVHCl2q+b5BaEJ1t2bZN2KbGEj1/VH2yKXNWBuV/3 Subject: [FFmpeg-devel] [PATCH] avformat/matroskadec: Check pre_ns 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: Rm/yBV6RH24r Fixes: division by 0 Fixes: 44615/clusterfuzz-testcase-minimized-ffmpeg_dem_WEBM_DASH_MANIFEST_fuzzer-6681108677263360 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/matroskadec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 31e5111225..91f3567692 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -4205,6 +4205,8 @@ static int64_t webm_dash_manifest_compute_bandwidth(AVFormatContext *s, int64_t // prebuffered. pre_bytes = desc_end.end_offset - desc_end.start_offset; pre_ns = desc_end.end_time_ns - desc_end.start_time_ns; + if (pre_ns <= 0) + return -1; pre_sec = pre_ns / nano_seconds_per_second; prebuffer_bytes += pre_bytes * ((temp_prebuffer_ns / nano_seconds_per_second) / pre_sec);