From patchwork Thu Jun 20 19:35:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50024 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp103507vqz; Thu, 20 Jun 2024 12:35:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVTtcAaqael+8KK7ni6Kit57xHGNrZkAYUmMGjq6nMHC9ESDlQZ0L+jY1dZTk7IRwmo7fCLZjxfaFFIrOWX8MOexKZReisrsWNk+A== X-Google-Smtp-Source: AGHT+IFwSZho++H77ow5Pdzx444+m8fGszmoJUr8g76ye7uTGurV1N1yjH2T0NZHyRyIozMqolfo X-Received: by 2002:a05:6402:791:b0:57d:455:d395 with SMTP id 4fb4d7f45d1cf-57d0455d5d4mr4831046a12.7.1718912139886; Thu, 20 Jun 2024 12:35:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718912139; cv=none; d=google.com; s=arc-20160816; b=OQW6Sf7fKW4owWq5M+64z5IU18VO7ZWXm79MDq9Q/d4wtlzzMTY5ttvSRAbwQAQIMf 4QG5bHpdZtM81aazOl+SvIUu8Vlq/8npP0NjJVyqzSxHO+V1x35dGF0XZvbOqGj3qP4n YBg4FUyspcTwP1V7KsfiilJEox9HBewqVevWEiMVBalBL+nyZKhWf1ASm6Z4zTisQ9/7 GTscyv1EvszSosvPLtCXGBvR1msITWyYt6g+k9FPBsIyV+iNWumMDrAF1tvxbb/Y3mSY zuaDbX3d8NzSA/KkT2mOHcUoGWrL2hf/DDWWx8Ne70IZ+T69i0Iml4ObN2W02Ytpzb5W /Ybw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=ILsv7nt09VtHXxZN4U62Y/usVc+nSTrtmR36Bffih+E=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=S/8O7+CRj71GfmYJNrb5Mn3J1OsgLPaOOyb4u6ftky9FSSOEIlWpRXE+ietLjvQSRn K/m/I4nImJpMT8uZ3vdymnPPL5xLdCMZuAo0SPg+vj7BTQUyUVK3/CkqdV4Vtwje0293 5dR/dNCKF6NVylRH5PvuldODP2FgsxxYow/1rtgNQIF1DWcYRTbjlXCMMFiBN60QFJBS yxuKh9NoACtveK8C/N8VbK+OFPiye4qxfr+vYHe4EmNXFtmN6L61JacsU6qM1Rh6pRL7 Qzi+beEOTBkXjgFFS8w1b2b9KOcr5PG06MbAGJmZQVx1eSU8my9Ve1HmwRPKessaRq84 1lMw==; 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=oaNOpjjS; 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 4fb4d7f45d1cf-57cb745fb62si7683828a12.532.2024.06.20.12.35.39; Thu, 20 Jun 2024 12:35:39 -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=oaNOpjjS; 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 E7F6868D89C; Thu, 20 Jun 2024 22:35:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5900368D80F for ; Thu, 20 Jun 2024 22:35:08 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 8381360002 for ; Thu, 20 Jun 2024 19:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718912107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YeeW4mAP1jFFnllfSEW1E62N94JmY3J3+ttRebxdKH0=; b=oaNOpjjSz1c4Ktwx9peu0T3Lh3eXHhjuIteS81tOnkCEUQ7Ae91/RCvNdO01AleY1zX9Z0 uQmymUzw2Qnpo1QFBpEWzZqz5Et7AoEzgDyUQHAnnU+BWBTxC8UGrduYo0hKdiI2NfCnNP NdnfY0yVDaJv88G8O/BT9SirHyoFg6jtntGMPu2YxKR4zgzkswZRKYXkiucp5RfVFOG3MS hHXbW+hifw7waahWdYBLLKbtgm68kgh30rlcbrDPlMXMvxz8vzJYE191/duVj9Z321D3FE i4dU9Rr/6NnvsKWp8/VIWNvuwrPzZOYXE4a/JmJy1PAgigy/gy+Da15cZ0RiQA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 20 Jun 2024 21:35:03 +0200 Message-ID: <20240620193504.2310780-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240620193504.2310780-1-michael@niedermayer.cc> References: <20240620193504.2310780-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/mpeg12enc: Use av_rescale() in vbv_buffer_size computation 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MyaZF9YTYnvb Fixes: signed integer overflow: 20 * 2314885530818453759 cannot be represented in type 'long' Fixes: 69098/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG2VIDEO_fuzzer-6107989688778752 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mpeg12enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 140fda4bc23..f22ca8a19f7 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -332,7 +332,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) else /* VBV calculation: Scaled so that a VCD has the proper * VBV size of 40 kilobytes */ - vbv_buffer_size = ((20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024; + vbv_buffer_size = av_rescale_rnd(s->bit_rate, 20, 1151929 / 2, AV_ROUND_ZERO) * 8 * 1024; vbv_buffer_size = (vbv_buffer_size + 16383) / 16384; put_sbits(&s->pb, 18, v);