From patchwork Tue Mar 26 00:11:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47465 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp1510622pzb; Mon, 25 Mar 2024 17:12:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVsOQ5ybHJv+TrWeR1N2h3B/0nDAskZZwYOW6qWIGqYqi6mZgPwk3WTc2TVX8+ZTigq6dbMRbfdiYqCKimbY+suFbYFacSyLPBffA== X-Google-Smtp-Source: AGHT+IE1PyOsWb+sEX/R4ZPpm5rso0cIzcC6JzHV1V9+swgnUO1fdOPrauQyPHD3it5mO8nNwoAF X-Received: by 2002:a17:907:961e:b0:a47:4366:567a with SMTP id gb30-20020a170907961e00b00a474366567amr5682711ejc.2.1711411950780; Mon, 25 Mar 2024 17:12:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711411950; cv=none; d=google.com; s=arc-20160816; b=sEUevkS2P/JqtTfwYxOlL3XOX9epAEFcIGaNYrhWKFkC/dUojRCVmZmY1pwj2FuO4I MpDPWg6RSeOz2NDOrstzZCNVakPQv72qcCQBrgKCNX9Zkq0/JJUCWDUYNKrQxfj7kHJf l1o7UH7XfvHLhVxhi40BOAKK6VZUj84zS2rwM7x7NOSeT6aC5QcqgMg5PgmP40UxdWlt FhWUwbKw73Gii0+G4nYfB8DAl2cJhr10FebWVUVvStezbsJ2GzkWKm1fgSPn4roNrqD8 Tb3v3v+ziZnGIau3WHCKsFB/2sqbqfTYKc0H6GehBPLznnZUmy9rUCZcDo3vZFnt9/5z cZww== 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=W7SFJl6SX76p0G3w3ZZ0dFu3QWipzllmWfEAxCWTKrU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=NcHsIyVvO9TCFO9IZ3/mbZc+RL56Glyx/ZbViu1k8YhSMDjcAH6aCB614Vlg5iZxgt sKP+98olc5vds8AnGyMawA7e0PZdh25iPNbPh25tX3QdTeho1fm9pcmBAq6YKAUy7DO1 GQg9wdZYSgtRIExxhd0TsPtnfSRuCKT8D01BPEJhK2SPEr/99uO2cQlW9OSbZKKHyreH gPaXxPEQhaXEVK+bfG2QA5bNalY88c0wqleO24HMCuHfszLM44VDr/3rFzuoBqnxzGNr KwGrkxKSSHqWXMlaFF6oN+XxZUtgF8ka0Qgao754/sfk+uJjdstKqkSIBs/Lt2qQml+a ml+w==; 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=p4xA7pOd; 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 ky25-20020a170907779900b00a46d75a522esi2912247ejc.792.2024.03.25.17.12.30; Mon, 25 Mar 2024 17:12:30 -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=p4xA7pOd; 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 B050C68D5F8; Tue, 26 Mar 2024 02:12:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A7D068D5E7 for ; Tue, 26 Mar 2024 02:11:55 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id C68EFE0003 for ; Tue, 26 Mar 2024 00:11:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711411914; 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=kzqrUMjTrOeRVGmQ56g1FJrZsfMT5aPtvMQ8nqw0oCI=; b=p4xA7pOdKsp5lt0IXAAzjfsykg62vTZmuU/UgqHz/coEd9uvRmKQmvYVWWRCIcEZYqTjdw 5YePa5ruprV3GH4otYl4KtUu0doLlsi6QBnifRYUbTQEv3LX8PYeFIChcmdmGKp2vI7lhF zpbHZQ3uS3u2G1L5ENXtn15ONjHwUSBp+WJdErJnB3v2ZSAlOSS2uJ4XEh0SxsvodJGh1r A/1TWogpw64oryneT17VSmvHF8MAk3HE5YowzvO4iaiSsGA2vx6a50HnDcZofOYe2yOqvJ NTDJtoTkrWAiRXAMNM6YttKBgKctLLCkBjVHdom3jHTr/uETU3HRisd8AhNXNA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 26 Mar 2024 01:11:45 +0100 Message-Id: <20240326001151.12083-4-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 04/10] avformat/timecode: use 64bit for intermediate for rounding in fps_from_frame_rate() 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: MxsxkgMWwsHU Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-4802790784303104 Fixes: signed integer overflow: 1768972133 + 968491058 cannot be represented in type 'int' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavutil/timecode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/timecode.c b/libavutil/timecode.c index b93f05b4b82..bd879bd3cc0 100644 --- a/libavutil/timecode.c +++ b/libavutil/timecode.c @@ -210,7 +210,7 @@ static int fps_from_frame_rate(AVRational rate) { if (!rate.den || !rate.num) return -1; - return (rate.num + rate.den/2) / rate.den; + return (rate.num + rate.den/2LL) / rate.den; } int av_timecode_check_frame_rate(AVRational rate)