From patchwork Wed Apr 3 22:51:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47780 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp708258pzb; Wed, 3 Apr 2024 15:52:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUoHa7sk7m2GpHRCZhEhiPDmApyyllAVOOm7B//KWLYvLF+bxPr6dAiTProMdipw3i//h9Gy+p5rA+UROTeuVW6s7o5EwbYWxhoMg== X-Google-Smtp-Source: AGHT+IEgK77DMGgtqLoQtfwAdh6dopwv8j3PyzWnkDJ4+pw6mBayNOhcxuEcP58Su3iBT1QGX1Ix X-Received: by 2002:a05:6402:1a53:b0:56e:10c2:8db3 with SMTP id bf19-20020a0564021a5300b0056e10c28db3mr461199edb.4.1712184742483; Wed, 03 Apr 2024 15:52:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712184742; cv=none; d=google.com; s=arc-20160816; b=AEhLePuBqziI/MZGKGgGys+uEroKwM93zm7YQiHi1NRIP5OHrY1VIFOYo6o9iimPVM SfZe7OrAchuiV9TPtIwdTqygw8FQ/xJWQKmTRwsb6CFOEdzs6TY6ZrmMV3w0h60SAGkn 0ZiSZbCPpa6yftzXAlnZ+9aiAJDSDCsTKVD9AnMDwzUWqlin7LlPJAJEB+b5tJvAgbzH GH2EgoIlPw2NjB8Ld9e3+sKokuYdpxh3YErV7uioDzWlE1IghB2Mmy63oC11HIJIRAwy TRHwHf2tGpD2r13SjtI0vqYY6MZP1MRP3yXJCvAAEB420185YALK/iZwSLYgsK0OlVII ehAg== 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=eqZInSTFCwnz2h569j8Q684mDfMuGU/1ka+YhPuq45A=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Uejz2hnHM6up4sqTvSS9EEKOzDKnqdJV4BdU0XvVjZosTIqPf6d/DmJnlPcPxAZetZ R2y/zaVnlRxPqO/DnpMv7eLUbkLDyMUT7q/lFSW142dQ0rUHSYPW5uvday0jskzjYdgo tInATx/dgCQcvl30fCLBBZeEIU/ecU1VJ2Bmn9YEgDZadKeHbIxh0T8Sy7hZdn+fs081 l1ZKJD9xwpjcHOPO3a4UM+2267eY7suiivMF4nk6bpl7Tb3xQgMvoS38gOWOdMdfA6CA DSmQ6S/yGRUCe55CNpg2wZIDab7jobMKQupQoKaULENVcKuO6HDtEZlihfxTtX0yEndt DsQQ==; 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=mB37F14L; 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 r23-20020a50d697000000b0056e07cc31ffsi1043920edi.397.2024.04.03.15.52.22; Wed, 03 Apr 2024 15:52: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=mB37F14L; 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 A900568D16F; Thu, 4 Apr 2024 01:51:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F8E568D146 for ; Thu, 4 Apr 2024 01:51:39 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 737F520003 for ; Wed, 3 Apr 2024 22:51:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1712184698; 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=cvUzKjjAnFxetOEwKzLGx5XlvtczstixMYmWplqJN+I=; b=mB37F14LloKNdBPXkRjWl4jBxOVQJdTZafOWVLkd4liVOW4FFzIgwB7LDVEvFuKEv4exwJ ksPrahQHbEHwtPw6Gno9Dofh0gmD0rbwypWUo3Fn6yqz5OWnVUpRyb+JJRp4p2nhK8lpnQ BduMDZ+KMCi5DFbtewLbYMEMNNaeWFj3Uo3EbjJKnVraaPFkj638zaRnuHHSNFbxfD9e2g FE48aYQ+MqVxF1axZ6otBs3pe+NI60OBp9ftVpmbjHJrBlCo0FsLPnqf+Bp2eQAIvbXMFl YhixZ8AYnO5wsVmuznR/WeyNGCnVt/p3F/AQt8mgJbpdWVeC+5RDJiHzwNMgsQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 4 Apr 2024 00:51:34 +0200 Message-Id: <20240403225134.31764-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240403225134.31764-1-michael@niedermayer.cc> References: <20240403225134.31764-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 5/5] avformat/pcm: Use 64bit in bitrate 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: urPR30NfmQKn Fixes: signed integer overflow: 65792 * 65312 cannot be represented in type 'int' Fixes: 67819/clusterfuzz-testcase-minimized-ffmpeg_dem_WADY_fuzzer-5236100912185344 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/pcm.c b/libavformat/pcm.c index 051e86dd464..a774dbc3726 100644 --- a/libavformat/pcm.c +++ b/libavformat/pcm.c @@ -41,7 +41,7 @@ int ff_pcm_default_packet_size(AVCodecParameters *par) /* Don't trust the codecpar bitrate if we can calculate it ourselves */ if (bits_per_sample > 0 && par->sample_rate > 0 && par->ch_layout.nb_channels > 0) if ((int64_t)par->sample_rate * par->ch_layout.nb_channels < INT64_MAX / bits_per_sample) - bitrate = bits_per_sample * par->sample_rate * par->ch_layout.nb_channels; + bitrate = bits_per_sample * (int64_t)par->sample_rate * par->ch_layout.nb_channels; if (bitrate > 0) { nb_samples = av_clip64(bitrate / 8 / PCM_DEMUX_TARGET_FPS / par->block_align, 1, max_samples);