From patchwork Tue Mar 26 00:11:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47470 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp1510866pzb; Mon, 25 Mar 2024 17:13:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU9rFqRYbmPNbRK8RXUwNq8sOndnb8hqLFKFtxjzX5m/vrLqoLeHOWyrjU4/MHJbR168a0tcQucp5YkZOUv+a0Jk4It047btEA44w== X-Google-Smtp-Source: AGHT+IEKXgYGQsrcG6KhbDHgDRYG2mC6yji/7NM0UzRqhQ+cHfLLVYkbGTYPgTvfTkFVA7k+X/iI X-Received: by 2002:a2e:908f:0:b0:2d4:ae2f:ce5 with SMTP id l15-20020a2e908f000000b002d4ae2f0ce5mr5253089ljg.40.1711411994476; Mon, 25 Mar 2024 17:13:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711411994; cv=none; d=google.com; s=arc-20160816; b=uJYR7f4LSjjsQjQIUHAnsu9DLKORBCZW5GQnQPp1r7wxm7Rz70D8JQUxIZEuXhSORB 9RPQINjX13o5LaXKwSikCNbHoByUwtfpjQdnRUbvxTGTlPInu6kF/B/yIJUmCa/pjIcB KDR+sp8ZFXlbCxKtvtPhWI0nY9qHwyOCfcfZxRQFY3L7HbHAcGgHA3WPlZV9HdqE2gwY KCKSv6JMGVHDps3We9brSkA9yHUWBMu1bSHjfhmEnsK6LCa1IQS8NL2nWb8N2FNsfs09 lR1HcT0bMfoKG+H5ULUCv67xH3GGAPhFTRBdokDQiZOqkjlo8I6shuOtCBGMoCjWBgd0 ROug== 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:dkim-signature:delivered-to; bh=PctA5sCBZ+oxSnFSIPZit8fHgDbqXqQrNCjzN94BU+I=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=KzvlJjq8ILX/d0f023i8bswBS3FzZ0Amh0iwg53iZPAGAkkzeEn63um6Pxar2wFNa/ TWnJW8AmReNdEBnKz7LUPq8Y9yCAHjnNcalY8nQkYmsFwtWXRiaWpU90Ra2lI/yl5HvY wByHRLT2Dz1DJEAAUvhYgxD8+N+cN8UsVdDnJokMsXvHSmUFqDrm9VHAB5yy7ghaE9Q4 nz2ei3nRkrPxRIeh824efK4kCj2JUho71HVkXbVxh38X2iMLXGn9Ml+ZE7MLT1ZKqZjW DL5z4ThFnEo2BSFYVjALeMWJZOxIYf8XsrWSIPhVa7eXaqBgcyL2s/uRDNheXnWbYEBk 1Bgg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=LG1hbkBL; 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 y11-20020a056402440b00b0056c09fda133si1739373eda.204.2024.03.25.17.13.14; Mon, 25 Mar 2024 17:13:14 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=LG1hbkBL; 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 F38D268D5F6; Tue, 26 Mar 2024 02:12:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2F7D68D603 for ; Tue, 26 Mar 2024 02:11:59 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 29F931BF204 for ; Tue, 26 Mar 2024 00:11:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711411919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=xoKub9vPX+f/Ra/ShcAKsUyaVQm4BvpVqXf2/4VX0L4=; b=LG1hbkBL+Whu2mc1kJPkrwiXk5Syb01zF/qAxTDSXSBPszLcYtJJjix4asWzDbF8gOecR7 yMJPRJ+tMwSfUiXHd/3g3Dne3Na9ehBYsLj3MsFl+D1Wtqjpk5AZJWK8e6Mm+bOAezku9T q5BdKtZC0e+Wb86TuHnTxuKGLXNz17ythY4eeY2ARXPVUw4C3nTfPMaH7jyEKcgpg0XECp AOZUZwBwqmnfPEfZSFA31zh6E0Ei1EJPSKktyZBal4q8SQtyF/fCAj+NgI3gzC3ZsV7ewC IEH1O3sF3uSJV7Zm1UL1O3NajrSgAAN6TBZeLauh2NG5UWA20re3dpFSilWcfA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 26 Mar 2024 01:11:50 +0100 Message-Id: <20240326001151.12083-9-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240326001151.12083-1-michael@niedermayer.cc> References: <20240326001151.12083-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 09/10] avformat/matroskadec: Check timescale 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: H2GgGqCVBbYc Fixes: 3.82046e+18 is outside the range of representable values of type 'unsigned int' Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_WEBM_DASH_MANIFEST_fuzzer-6381436594421760 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/matroskadec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 8897fd622c6..8e031c618ba 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3195,6 +3195,10 @@ static int matroska_parse_tracks(AVFormatContext *s) track->time_scale); track->time_scale = 1.0; } + + if (matroska->time_scale * track->time_scale > UINT_MAX) + return AVERROR_INVALIDDATA; + avpriv_set_pts_info(st, 64, matroska->time_scale * track->time_scale, 1000 * 1000 * 1000); /* 64 bit pts in ns */