From patchwork Mon Jul 5 18:32:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28786 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp4394394ios; Mon, 5 Jul 2021 11:33:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2WzTO64VrN6tX1LoyrMswV9MN+pXG6sl8Ke33IyAdFI4CaCobhDfNnwMs9MqKlT2ZhJWl X-Received: by 2002:aa7:dc01:: with SMTP id b1mr17554428edu.239.1625510023052; Mon, 05 Jul 2021 11:33:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625510023; cv=none; d=google.com; s=arc-20160816; b=pMLPmhHZLqHUFuc4loeTWwQ3nAqfX6AZKTRyRq3gCAXjS5RjeCKNUCmkmlY2SNGrDG ZCVkceC1TSWbjkZ61UwIEB4HW+vAexlUq8DbpDkBqMgLGtMZOMGrjZtQgXoH56VspT7h orNAv4Jr3KGlYvtyLBfQ9taTc73oz+H2HzdIYohKDaLTwGnqwtnKyb4isBj/CKFWPeXR WlxIJh4ixD0DoQlJeKK2SO1pGZKTY9/52GPsqWTBZfvXrPNOmn/JvcBOsTb1utpL3Ilv 0C6nj8TJjeJOYZi+lIjaKRRTfIhoytnw631apRSjPqgqw+mKOnUE5ncBN75k8ew6cqS8 RMMQ== 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=mn8JIL+wojotEqj0fcBwJnAsR86Oo+woXT3qxCGC3KY=; b=F0MtDJq26SVWWkuXxSyLLAuFzrCWul98DIan3rX7qaVY1e5hRgYPo8qw85zQ27os1A 0yJggKqn+zV5uCHMbAH2704TN7xQP1Zwdm96BYXuYbyvF4FvwXFq2JA5B2weeEyg8ADY eVHSrHAMKzgrIZdqvrg6iHi0us79+xPLrbUQA7YGBoCJebxMSsJCWsoussGj8OQY4tDy mp7F6Nw0DBhJtTjgWLXXA/+TGM2D6Xn29EocItY+jLL6JPNU4URRqT3NMrYoHvTxPGZ9 ZM8IsE/4J3LXuR12An13JyVpqCIBW/YXIHPDmQzTPKYMu7m3F04j7jIGuSgFBP2WI9gc jLaA== 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 n8si532540edo.29.2021.07.05.11.33.42; Mon, 05 Jul 2021 11:33:43 -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 7DF2C68A5F7; Mon, 5 Jul 2021 21:33:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8647C68A2F4 for ; Mon, 5 Jul 2021 21:33:31 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1m0TPP-00CdG4-0B for ffmpeg-devel@ffmpeg.org; Mon, 05 Jul 2021 20:33:31 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 0TORmHGOTljeH0TORmVDgT; Mon, 05 Jul 2021 20:32:31 +0200 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=BoHjPrf5 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=nZOtpAppAAAA:20 a=ce-iW-_NoQSp79ZLewUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 5 Jul 2021 20:32:30 +0200 Message-Id: <20210705183230.13216-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfAIOaWSFl5VRdWSJR3hd7nmZhSDOcu+acuwUEDTW5M+VvfseZw8Almky+NnjUYoTjQM7nrq47WNf83UQSCkf5BJsGsFB+kjmUQAyRXNjyMtrGxa9ssA/ POVL9Aa0ucSAEXbuVQtmSOyJbyAQxQrMX6sJT/yM9/f2ZeihrB89uD99 Subject: [FFmpeg-devel] [PATCH] avformat/matroskadec: Fix handling of huge default 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: zG+XBwe3Tcft Fixes: negation of -9223372036854775808 cannot be represented in type 'int64_t' (aka 'long'); cast to an unsigned type to negate this value to itself Fixes: 33997/clusterfuzz-testcase-minimized-ffmpeg_dem_WEBM_DASH_MANIFEST_fuzzer-6752039691485184 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 356a02339c..cb9e4d621f 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2805,8 +2805,9 @@ static int matroska_parse_tracks(AVFormatContext *s) st->internal->need_parsing = AVSTREAM_PARSE_HEADERS; if (track->default_duration) { + int div = track->default_duration <= INT64_MAX ? 1 : 2; av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den, - 1000000000, track->default_duration, 30000); + 1000000000 / div, track->default_duration / div, 30000); #if FF_API_R_FRAME_RATE if ( st->avg_frame_rate.num < st->avg_frame_rate.den * 1000LL && st->avg_frame_rate.num > st->avg_frame_rate.den * 5LL)