From patchwork Thu Mar 10 23:47:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34660 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1221595nkb; Thu, 10 Mar 2022 15:48:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJwplx41gvM2rXMd0G1MsE4jDE3TLYmR/+HzBUqDZXYRFZkcyJwWpRakDK7pTheKU04cOEiR X-Received: by 2002:a17:906:c14e:b0:6da:970b:cc33 with SMTP id dp14-20020a170906c14e00b006da970bcc33mr6229822ejc.307.1646956095468; Thu, 10 Mar 2022 15:48:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646956095; cv=none; d=google.com; s=arc-20160816; b=AJKQHn7HCRt5HBe+IfrWwo+4SlZfzES4OX8gDceUAr5PICloz4WWbKVNBjmPo/NpRg nIoFrVzp1l+TRP4dpPLl1EroKcIKLBy8hYn6XMvdOvvKntbnBpSb6r51Etaf/XsylhO+ pFs0tE5yq8G/a+W/OxB1j6U2RQZHQHZucIjNO+9N4D6SYwDtoDfWIdWd2BW9nFAaRGGa rycrms9LqiJbySfOMBjiN22DPYM7/e0TKvaMOYXd6N3Y4dyMGbFZReYR3bjpowt7We5R GMUsCtbRghTko1lFIre32IfQS7Pm9uU1MgGvkBbqFIRiTVGhgsBScro9oCVBv9rsw5Is +zwQ== 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=pC3UHi/H+8V2SblZftoQjyTujEx2Is2s123YIop24eo=; b=cd9ArzYXwCDltder8z6k512vzdHe8AD0V/MoDoq57Agtlqmv4ZFrmDiqxQpwFMA3Hw QaxtDdIgfAcaR8n4x+1RPzmY7dl5pBbYcI3H9EWS1izChLZqSMNKiWjeELjzb/LOtPAW neuk6IBDLKUu/5+/ol0zbOv1DoSulv+kmMUCWEVppVpmec81aTH6CVO6mroyTuu4m7b2 k/0AW01EWc6no21FaX8qWv3p5JB/tYRy09IiugjS8qf8inN3YL3zK1BImqr2gPgevbqL xHZjlf2qFWJWGYpVZPrImolnOG3P4Rh1PhcOHWXEt5W9NukCQ1fUXfHu2cGPmBDJrWkn 4ZZQ== 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 q8-20020a1709066b0800b006cff6489678si4174458ejr.976.2022.03.10.15.48.14; Thu, 10 Mar 2022 15:48: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 9866968B1BC; Fri, 11 Mar 2022 01:48:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-3.mx.upcmail.net (vie01a-dmta-at02-3.mx.upcmail.net [62.179.121.150]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3192868AD9E for ; Fri, 11 Mar 2022 01:48:04 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nSSVn-0006NG-As for ffmpeg-devel@ffmpeg.org; Fri, 11 Mar 2022 00:48:03 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id SSVFnOZeASgGFSSVnnzSly; Fri, 11 Mar 2022 00:48:03 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id SSVXnd015OPqFSSVXnAE8Q; Fri, 11 Mar 2022 00:47:48 +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.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=622a8e32 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=aF2MFFFvs4iusO9WLjwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 11 Mar 2022 00:47:47 +0100 Message-Id: <20220310234747.29322-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfH9rHqDmn91Rc2vMAblgakIipdTvMb/vOViTMALwq368tett43MQuwdKIHZkud6PtTXIbpZZY9A6onk3ojMPp7HQ2F/ftqp4YNjMgavmGNT/nd+JJcKq QFsKiylcZ1RZQCqohshfyKjubZwXHoYQoJ0k0cpkYBw7MZnNhxzzHdWI7bcNUBz84IdaVLtaUaQ2Aw== Subject: [FFmpeg-devel] [PATCH] avformat/matroskadec: Use rounded down duration in get_cue_desc() check 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: 0HRZ4+fSMo/g Floating point is evil, it would be better if duration was not a double Fixes: Infinite loop Fixes: 45123/clusterfuzz-testcase-minimized-ffmpeg_dem_WEBM_DASH_MANIFEST_fuzzer-6725052291219456 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/matroskadec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 95e49cbe7f..4aa4f0d828 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -4008,7 +4008,8 @@ static CueDesc get_cue_desc(AVFormatContext *s, int64_t ts, int64_t cues_start) CueDesc cue_desc; int i; - if (ts >= matroska->duration * matroska->time_scale) return (CueDesc) {-1, -1, -1, -1}; + if (ts >= (int64_t)(matroska->duration * matroska->time_scale)) + return (CueDesc) {-1, -1, -1, -1}; for (i = 1; i < nb_index_entries; i++) { if (index_entries[i - 1].timestamp * matroska->time_scale <= ts && index_entries[i].timestamp * matroska->time_scale > ts) {