From patchwork Mon Feb 14 19:39:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34285 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp5800163nkb; Mon, 14 Feb 2022 11:40:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJz0fbWdy1jYkd6MPkjCyNAhQMlsuXhwOz2jGfkNSsCcAsMdSoC+okCvyaqPVoA65BYont6q X-Received: by 2002:a17:907:6e90:: with SMTP id sh16mr286416ejc.456.1644867646889; Mon, 14 Feb 2022 11:40:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644867646; cv=none; d=google.com; s=arc-20160816; b=h7rywcE000CK+sDkv7iXvl7qOskcd1qDnCWTl9yRwpfX4cdzD/G4wjSFroMA2rW5OU V9tdggjXq2xT70teCiAeN2F7uCKCmgzqd9dljqnR44A52Tg4sMSq1xRq0rYm06rWjbBQ sO2ZF11+zadbqUiyvKBXJN6nD4MN6f00cdE40gLfOWlJVeit45ZEEQ0pyq6at6WSbc8p NtzxSpSIKvUI5EKN0asMF6tiU+7wFrMeYjXVejOk3YzH7x1O37Yu4nVDV1tuHGkynZnE 1zTDR0JSXYpQkhrwfhMaNK5Cdxkr9NRYqrwIVFUPi/mXRK58grG0ivZxZEaHTAX3XJB4 gnOA== 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=1bmpbvX7wGqwCAX7Inrqhf4WHMGShMBrNk3YHUbKMCA=; b=MZDjYlfpYF5dJfr0nrxpjATEaAQWZMKJsw4s7huBBvBbl+JoTJDozCJoSgTVuyAPyk sIozFLFwyRVyc6oTCzvfi3gVSlGB0lKiZQGvsiO3M48GWqOiwHcCDgBUv9uiDWzx8CH2 i73XegZk8AFWssuHyd1Hb2z7WBwC6dHa63WrFRnHyOammBCtnAbtZgjrFK/BybShqJyv CIzsrRKqJba8b+pNpweanO/NkNPlt0MKd0iV9iaHcT4vT1r2YYvbcNK4NUSX1qp9dEya KLA9URtIlWaAFr3QZubLwa33Kad8P6G1Nfl5HN+sfCCjg45suyHnuu/Y0uXiiqonipoR Iugw== 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 ji3si5201681ejc.39.2022.02.14.11.40.45; Mon, 14 Feb 2022 11:40:46 -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 7678068B1B0; Mon, 14 Feb 2022 21:40:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D976D68AFEB for ; Mon, 14 Feb 2022 21:40:35 +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 1nJhD9-00GpMG-0E for ffmpeg-devel@ffmpeg.org; Mon, 14 Feb 2022 20:40:35 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id JhCAn3LVkSgGFJhCAn788X; Mon, 14 Feb 2022 20:39:35 +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=9zACHkxo1Dco4ITghHYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 14 Feb 2022 20:39:31 +0100 Message-Id: <20220214193934.22315-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfJxsN5mlII1NjujWZeJ+PVELYUNGssyeAaCYx45Cu7wpsQohXB62yYf0HkzoTerI8dxZqO7RqjR4wXhNgdaUX2QSB2TpSsn1R1vQD70Bwso4QKJ92nFj 5j+TvTqRSVr0UT/v7uSAD+0to3MfqSSN6XYq/dtTTnIXcwXhjo4pa+yh Subject: [FFmpeg-devel] [PATCH 1/4] avformat/matroskadec: Check duration 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: 7Y0TiE2AsY/3 Fixes: -nan is outside the range of representable values of type 'long' Fixes: 44614/clusterfuzz-testcase-minimized-ffmpeg_dem_WEBM_DASH_MANIFEST_fuzzer-6216204841254912 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 91f3567692..8f0c53a6bc 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3065,6 +3065,8 @@ static int matroska_read_header(AVFormatContext *s) if (!matroska->time_scale) matroska->time_scale = 1000000; + if (isnan(matroska->duration)) + matroska->duration = 0; if (matroska->duration) matroska->ctx->duration = matroska->duration * matroska->time_scale * 1000 / AV_TIME_BASE;