From patchwork Sun Dec 5 21:19:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32087 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp5145640qvn; Sun, 5 Dec 2021 13:20:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJwNgLlzXnErPFULE+MafwtDpQWkDSWcOBVvN5/PjpXVPj24mGLlcvLksB1koMbHZO8aqlNZ X-Received: by 2002:a05:6402:4302:: with SMTP id m2mr47975989edc.349.1638739224105; Sun, 05 Dec 2021 13:20:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638739224; cv=none; d=google.com; s=arc-20160816; b=Ov9/g8A2bKSIIn1RDpSBESF/N1G0alZm60Ugkmd+pRRbe95kd1ZUlq1cQoVasFVs5K zaMMySt5Lu5MD7+k8TvRT6dRSMtfO0QZqiOa7Rard+7/11Z3qQa1Z9Z9kK3vqIHf//bF n2+vsiS1t4i6UjQ8ck1hZ84uYN5IV/2Mx8Ug7+BaNeHq9EhmWnqNhTR+ZWaWFf0eSyiH 9x7nu6FY0a5l9Mstr0MlhITenLByXgLGxNkbmf6oWT1v2Y8Ee8QIetkFZ88M+9h89aVK 1x7iH3KUu8ZbuwHNP5eI9hY6mzaO1otXFAoU54NI7Sdj38H4f88/K1b5VLmsOgfWQHC4 daug== 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=U/F9IzJidC+vOL2lAY4XazPs7CaH3DM3dNXLkJfyJXk=; b=zYzMe2NYVDeLG/mpNc1i/2LUC6fjaZcVThdAzcRurcPXcDWheno4Ko07LXoQ8OM8Pv 2TOhF23+NUQ3n3wI/jAmc1HkxgraDvh4Qp4lUMF+Kak5F2/PWoR5spPNwrvpPUmfp/il Yd2sqSnnAvf/WlhcolKmZ3JbIhVqu0Q97xozHOGol3M2CbSukS5oWtEi22kLq6JbuxW3 1J/PPevKyDXEXW47m0HvISsohDBEiqPunVbdFY+EGrRGXg8ucX4n7G0BTGuSnsMYcpr8 KBgrEa4BPQIrNACCf4BgLICej+PrLbe1PjTRazcgR/yG4bvbzVfjNiHXNSYYVw0U01tV w9Zw== 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 ce16si12654253ejb.5.2021.12.05.13.20.23; Sun, 05 Dec 2021 13:20:24 -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 B72BC689F08; Sun, 5 Dec 2021 23:20:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7188C68A774 for ; Sun, 5 Dec 2021 23:20:08 +0200 (EET) 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 1mtyvY-002LQv-09 for ffmpeg-devel@ffmpeg.org; Sun, 05 Dec 2021 22:20:08 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id tyuZm2RMASgGFtyuZmZqPz; Sun, 05 Dec 2021 22:19:08 +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=tmNr3_pU3QajR3og:21 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=i-pOUFe3lJeFySpJwgoA:9 a=QyQtT3pqVO38aunEuior:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 Dec 2021 22:19:01 +0100 Message-Id: <20211205211907.30010-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfA78OTeQ1Gwn8l2Mqga9D52HMwO3okBQ67D3LJlb/ioe+xzMhuuhAszYtgA2N45OuC/wuC0+WHJJqfCaXpxsj0oLHIv+IkGvT5hM7YU9oU/9hhtTYI9G CmlsG5asL4V+9HbtUUKhuQ+UeU/gJGJ/s0RgR0F15sr90g4sGg76ot1+ Subject: [FFmpeg-devel] [PATCH 1/7] avformat/vivo: Do not use the general expression evaluator for parsing a floating point value 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: ojZVIqGH8wTj Content-Length: 1353 Fixes: Timeout Fixes: 41564/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVO_fuzzer-6309014024093696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/vivo.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/vivo.c b/libavformat/vivo.c index b2904cd25a7..8e819d910b7 100644 --- a/libavformat/vivo.c +++ b/libavformat/vivo.c @@ -206,11 +206,12 @@ static int vivo_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; value_used = 1; } else if (!strcmp(key, "FPS")) { - AVRational tmp; + double d; + if (sscanf(value, "%f", &d) != 1) + return AVERROR_INVALIDDATA; value_used = 1; - if (!av_parse_ratio(&tmp, value, 10000, AV_LOG_WARNING, s)) - fps = av_inv_q(tmp); + fps = av_d2q(1/d, 10000); } if (!value_used)