From patchwork Tue Mar 26 00:11:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47464 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp1510579pzb; Mon, 25 Mar 2024 17:12:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV4tqFO8RpZw7Xaritp0MO5xYpRmmOk0ckOAELtOM/mTga4m+HTzcaWWLI4TVMLIrBrdlyqIrp7oBEYyFaU2iC2CLPSyIgtPjGlpw== X-Google-Smtp-Source: AGHT+IERE8eTNNNmTrxuqVrWs4Zelgk+JbQCkLKwm8CqRYndKowYX8thTmlqFoT8oJbBJHN2D7cS X-Received: by 2002:a50:f612:0:b0:568:a655:49c6 with SMTP id c18-20020a50f612000000b00568a65549c6mr7086623edn.8.1711411942500; Mon, 25 Mar 2024 17:12:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711411942; cv=none; d=google.com; s=arc-20160816; b=c1DPsm6c/OvdLt0HTd0A9oqpYxOl08Rofds5GKS75M7jZ3vsSh9s2EYlDl6Nu0vQcg 4Yy3XK4kxaf4Rx/NGNdr2WZ3R0DZ50Hl/zmDGbfQd4J0mJFUSQxtdA0UOeSOsJTbT+Oh slGGBg4NoAMXOXsZ59Q+zFmbEyaCrYHWnl2COzMU7H0aQzPPmzQmZe4blVF1tS0kFBsg sX9xvG2ok/h1Cp+32X/MuEAO/DiV6R8DZW/qBi/2PzVJYk6iB3IQGJ/lEpNGUSl4Th8b cE6kFwJZgug//y5vlX+bJean8C9ylegGus2ZFN6gExSCgBAsPs70hrBIyyivajtfmKws PZUQ== 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=W+rsZl3+q62nE/3Dc/z/NQHPUDXK1AgZmaVlPcgno70=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=eFOzDcWHRy9tIMBo2zm5fk2EPQhu21BIL7/L7bred9W6ilEqdpaFXh5oD/fpocYXZA 09XUOy8BxMhl26LIukD0otqTZmluVrMtnnhQ0KKWW+0s9DFvu7TFszvDQxTs+THVQv7q PdRvfUEx58Wr4wuesFUqb2nsMwla0HpNmfJPiqP/Au0Mo0+KqSFQslDl2P56d2fCA21H 34xJPyRU89TDn4L9Em31mEj5CG38KGg926Hm2nOEiy32qCSMP51U1kADRASIVgfBv2Ta c4AqPkL0NjG5LEWXIdeR9uD7HwUpaa/gEBeQpV2QqzantxNyE4NpXKZGTz0+F/oDjET/ 0Dyg==; 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=d2Zwm+0U; 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 b23-20020aa7dc17000000b0056bbfe5d156si3027187edu.414.2024.03.25.17.12.22; Mon, 25 Mar 2024 17:12:22 -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=d2Zwm+0U; 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 8F03368D5F0; Tue, 26 Mar 2024 02:12:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD4FE68D5DC for ; Tue, 26 Mar 2024 02:11:54 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 245A340004 for ; Tue, 26 Mar 2024 00:11:53 +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=a5Mf598dRUqirGn4AmSy9OTp/9bX0DepOUvafSa5+lw=; b=d2Zwm+0U9WPTnfIMjaPiCPG7n1bl4qyp6Ztz/34r/TOViGbYC+hxkCzwQgObFZ7NIFEHRi 9sQ46Lu59wv9+u9Il8B62lBaLqcmxkF5poNLOUFYbrW6cp3gScI/P6WV0ME6TGOaa5q0ed paQRDIxqL15oGXSzOAbj1PnJLNDL2tLMVTTiTG7OZBPdJgFi8cv6vPCOpdp5nhKY19a1YU G3Ugt1iTNJ8uwuI/CHnMw1mhUOCTTPykjMz4r7ivjIZraO/d/x56kPkLKwEoQpsc8GpT4p l6Q4wmZUIrlOVM5gRW+MUAvDJd6kz+xUGXa+39A+iJsIzfS3iku/MEsExE3WnQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 26 Mar 2024 01:11:44 +0100 Message-Id: <20240326001151.12083-3-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 03/10] avformat/mov: use 64bit for intermediate for rounding 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: Tb9LjO3NmLTp Fixes: signed integer overflow: 1768972133 + 968491058 cannot be represented in type 'int' Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-4802790784303104 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index f954b924a02..e5e704caeb1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8993,7 +8993,7 @@ static int mov_read_timecode_track(AVFormatContext *s, AVStream *st) /* 60 fps content have tmcd_nb_frames set to 30 but tc_rate set to 60, so * we multiply the frame number with the quotient. * See tickets #9492, #9710. */ - rounded_tc_rate = (tc_rate.num + tc_rate.den / 2) / tc_rate.den; + rounded_tc_rate = (tc_rate.num + tc_rate.den / 2LL) / tc_rate.den; /* Work around files where tmcd_nb_frames is rounded down from frame rate * instead of up. See ticket #5978. */ if (tmcd_nb_frames == tc_rate.num / tc_rate.den &&