From patchwork Thu May 23 01:17:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp734448vqf; Wed, 22 May 2024 18:18:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUYA/SCoWB3jq9tmRzV43fzmKRI+dtV++a7WPfH6+afQsn59UwR4EKnPiundPF77O+zLgdidthO/WsujBd6FbtY2lxmIE5LXvxA7w== X-Google-Smtp-Source: AGHT+IGymZuh0z/+5Lsr2m9Pz8nShnAlhlDIi211LOKqm6Rs4sRHoWRu2oPi0wBow8gQMRBj8L3W X-Received: by 2002:a17:906:4941:b0:a59:c28a:7eb4 with SMTP id a640c23a62f3a-a62280d4f1dmr214738466b.44.1716427091602; Wed, 22 May 2024 18:18:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716427091; cv=none; d=google.com; s=arc-20160816; b=La70FrXluwC9yylCDJFtb5KNf1RhoWyQJI/4rqwOLCnqMlgxdzU3PkrZ7gEoJKvGqM CRv/zqzNBRDPX+B+uiPV2j+iOCpNXSNloi9lnUJK1NipJMCU5kcCjo5qE5uesyGTGsbY gV7Q5I/NwdJv/8VbfY1eYvuZuVeZikwVSFRvUIPAxy/xuiOx0Va6g4fqbQil+74CaIk8 Wu5Y0m+jPGip5Z3jJVwDk5SiO3kovrVIE1JPiMdEVnHzu1sGaLvJ5PmNevWlOjuoQs6U y9fJoknNbKsTfE1Qu03RVQU2ZbQSaR8v7oaN9KScN6SiXimQNOT9IADTBuJDgv14S76g ACkQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=zrZDocMg6rns52HSOnDhZQNPh26OJkvAeQvnzDPsLi8=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=v5QFW8zwpgj0yXtnaYcgBcnXd/9hrze+JVDAPQWGmmg6tRqw83JBpe0pDC+vXrnb5K QgqDC4QzFXCi1U8z3d6EnC0qoMxmdcL3R6r4wVCKAK2HiyM+W6PVD/PtH0e2lxMK65+6 MmJVivf6kGz2vasWfKTozhkY1kDtSxQHcri7pGMkigsdsZy4ld6smA41Ml0UCu5DpCW/ wKwYbNXcbXZm8/IPrFHlwll771B83B7esBiZeHawv8ShaX8N5/LWv1DkFHHHiql1fbDA 3xAKtb0tS/2/OD2rdMR0CkOVWIXRGMfZOET6/W5YtQrpdq6Wjxnomw0vn/sSKDFTqmwK zMGQ==; 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=cYRwtdZi; 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 a640c23a62f3a-a5a17be6dc0si1612127366b.778.2024.05.22.18.18.11; Wed, 22 May 2024 18:18:11 -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=cYRwtdZi; 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 A4E6768D432; Thu, 23 May 2024 04:18:07 +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 BC3C768D26B for ; Thu, 23 May 2024 04:18:00 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 8CFF520002 for ; Thu, 23 May 2024 01:17:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716427079; 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; bh=vVAF6IP7ITBS1YSMtV71q+WK6lrXQe9bCzabDbDRVV8=; b=cYRwtdZi4gXhT2nkdeDDZPc/ihbAOiH3izUni3IDl3JhG9vYU2d3VSKc+XMUIqIHZHLtyM GG+smGpjW+Qh1ktLY99vpsurcnU64Tg1/wpwGf1WkcL1vKXUcS/2Hs+Urc7GmmpP4yQo4U fg8e+qepa98Rdn9oKoEpAmcvdXHOhBmr36U56CaVVgqsuaOI26Ud7W5/h7qgsgn/y3IS/j +uP0dbxRCYNKkaD3XeMnSiRBaaDLxGkrmzqe/PZlOEc4Q004z9D0HmVfljt2jKT52AZ7Rm 9bRwW1Y1oF/o1wtvVKh5rAfx8G3V9iurO3fiOA9pDT2jA9Vzr9tAKnpSMDTvIA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 23 May 2024 03:17:52 +0200 Message-ID: <20240523011758.2434580-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/7] avdevice/pulse_audio_enc: Use av_rescale() to avoid integer overflow 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: 4vcZcKu5J/In Fixes: CID1503075 Unintentional integer overflow Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavdevice/pulse_audio_enc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c index 3e2cc91f697..80136d1e20c 100644 --- a/libavdevice/pulse_audio_enc.c +++ b/libavdevice/pulse_audio_enc.c @@ -471,10 +471,11 @@ static av_cold int pulse_write_header(AVFormatContext *h) s->nonblocking = (h->flags & AVFMT_FLAG_NONBLOCK); if (s->buffer_duration) { - int64_t bytes = s->buffer_duration; - bytes *= st->codecpar->ch_layout.nb_channels * st->codecpar->sample_rate * - av_get_bytes_per_sample(st->codecpar->format); - bytes /= 1000; + int64_t bytes = av_rescale(s->buffer_duration, + st->codecpar->ch_layout.nb_channels * + (int64_t)st->codecpar->sample_rate * + av_get_bytes_per_sample(st->codecpar->format), + 1000); buffer_attributes.tlength = FFMAX(s->buffer_size, av_clip64(bytes, 0, UINT32_MAX - 1)); av_log(s, AV_LOG_DEBUG, "Buffer duration: %ums recalculated into %"PRId64" bytes buffer.\n",