From patchwork Sat Apr 24 15:59:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27271 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp2202262yba; Sat, 24 Apr 2021 09:00:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQXnX+8vDrWm+7JlM72KSnzh/FwAfAklzpFN8M1j8idNv46gAd7jOL3fYI1rNdOIpaxWd+ X-Received: by 2002:a17:906:81cc:: with SMTP id e12mr9686575ejx.21.1619280036116; Sat, 24 Apr 2021 09:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619280036; cv=none; d=google.com; s=arc-20160816; b=CCCcVWipyqpMbTWK/sz/r5kJl8EHiTWuOQaaEj4qJxpTwUgC/nvCclfoLnQ+dH73KE DVGJ5ielo2QcEiwKNIra4d/z1wme1+UGl6wssuc+Rq/B6so7ZsLij2rFnGiyCMTlXuck 9cD9Zs22P2TrjK+M4klrmnzsizgovI0AEEBazcvYktgsEnQaIyA/VOL2MzZkjeGo5idp zBe5Z9NUvS5D+H/bvoap/u4o3BMqgaTV/KYbIKTRxGHbIJP6uhtVsnqbtv5SJ26s+KfU K5nXWU/ZB3QgdSZL72fLVo8I1uRr68rbm7KRL241Om2CLUGegEfT5Kktyzr02+fArDMI 1HSQ== 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=m1fO00XVWdRAlxMgNGMwTWbHhE5jp0tF34ZE84t2rcQ=; b=CH7VrRnkoQz3rR+p2GAIk9ZdR/EJ0yMPdPBgwP8nnpHttUF/sWhCnZphJ9F+0oTVrY 8vBWVze3DIdmfCxDa7Reh2aslYeGARBzZAT+xy5Z2X2Trnp9jkdX2/tkO4C7cql/WgJk BfG9rbWQdS4hmqpv6c8364kM+vbR1BiCjgN4DDKVsQMrsgK1bNsSCY28ARz09vAwBdW7 UXXzdthIpvp1tpG5HJKHcZaioIvCe6QrX5vM0/RxhhMmn1VJIqV2fGRncYJ4lKVpvI7I esxsHX9hpWIHHgcQ/EHQq0Yr3/YEag3H8981ft0XmpvUp2wtIflhA/8g8CuAu06pnB/i eRsw== 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 p20si2135163ejb.124.2021.04.24.09.00.34; Sat, 24 Apr 2021 09:00:36 -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 45A01680BD4; Sat, 24 Apr 2021 19:00:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C498A680306 for ; Sat, 24 Apr 2021 19:00:26 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1laKhm-00GTWD-0K for ffmpeg-devel@ffmpeg.org; Sat, 24 Apr 2021 18:00:26 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id aKgolhTPaljeHaKgoljNBj; Sat, 24 Apr 2021 17:59:26 +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=wh31a4_u-3O8hZYYS8YA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=bWyr8ysk75zN3GCy5bjg:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 24 Apr 2021 17:59:23 +0200 Message-Id: <20210424155926.4018-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfFan9fhPp3LiC7mEEtYq2AqxtjFD5LLs7mI0tv4G4JPq8G9PWfZ5/UJd8rYsPilZrt31nApJZf6ZVrxOFSGSYKL5oAO+tMefipAgmPmwDpB3EhDtWD1m y2tGBvyi/iXqnNMa3skNFIRzmABugGKKVUIStX/hGHJvXmE7NIUgOI7y Subject: [FFmpeg-devel] [PATCH 1/4] avformat/dxa: Check fps to be within the supported range more precissely 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: NWqlN4pU0pPx Content-Length: 1134 Fixes: negation of -2147483648 cannot be represented in type 'int32_t' (aka 'int'); cast to an unsigned type to negate this value to itself Fixes: assertiomnm failure Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-6744985740378112 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/dxa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dxa.c b/libavformat/dxa.c index 909c5ba2ba..cd9c489851 100644 --- a/libavformat/dxa.c +++ b/libavformat/dxa.c @@ -79,7 +79,7 @@ static int dxa_read_header(AVFormatContext *s) if(fps > 0){ den = 1000; num = fps; - }else if (fps < 0){ + }else if (fps < 0 && fps > INT_MIN){ den = 100000; num = -fps; }else{