From patchwork Thu May 23 01:17:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49156 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp734536vqf; Wed, 22 May 2024 18:18:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUtzz6gB3qs1+Wo+JCYE543FVn40zFzhO/Hm/f6fC8cNleSgpaxBIrog1oEZZV3GWLIFcNSSY7Jn0urPzrZ/XwasQOvLz4Te9pRzw== X-Google-Smtp-Source: AGHT+IGwbHvzCQ1pOwkQzD277kKO90pXLii27NSMV2ECEXKnA/4aW1JsboscHWH57np91eWJv2l3 X-Received: by 2002:a50:d4d2:0:b0:56e:238e:372c with SMTP id 4fb4d7f45d1cf-57832c1a8b2mr1888322a12.26.1716427109953; Wed, 22 May 2024 18:18:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716427109; cv=none; d=google.com; s=arc-20160816; b=sIrGNs3K4v405A08QlToGQ0XECBCeFZlWywSg/VwlQVCK8dKrhRmI9ty+oETl3rW0J EMy6Z7Slh9lALg/ubODYxwCkq7PQ9kBGyAfqnNZRCkb3jmyxyMNUtZ+2goaUIKjUyyKl V/xywKx+yLUCGHgAf3e4P6EfqFiKWd2HwUMNiX4vfGa3CUTVZGZ1rJY0PUZrfn7bN0aU vGRweo9WojtFu2O579zTtJx0/uADJFrzyFl2Jb/dKKcbP+kzbnFWRyIok/+NSdmnTUYO VbDhlxnLbOfONVfciJXGFBZR7JdSGSjoveyEMBErLt5rQlMHhpqOCpLT2KQEL+DGXuI6 FL+A== 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=6diUFbe6G54a6k2gCnsbMhB38L2XagquIxlvS0yLL1E=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=zrCRb+xhG7YvV+ed1bB1HXxFfEpue4LBmMrZnuERRpYhvg0eSTK1gW51v91l/MhLEW WXnUjMnvtJBhQp4qC5GiTBchCGq1Bi+4oLsHQTfhCV1zImSbbLJUgwGPoTmJdBZSXjrY 3Fv3PRI92aM4q4M5eJzd3krgcUpic6SMFV+h7qaV/RyT/VMNS61a0esgyBylYGiitWLp wg5BOLrzbxSO+1gC3uIhJ5SmGS3TrrgoWdkAj1UQaycTLJ9DoC3gRrs0gfpm+u6es/MA skObA9SXjSHz5Y9w4bA1JQFCwVyFtaJo1BBd4EXf8CvtRiIPx7OICK3GNc/vhKtqkvIQ vMMQ==; 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=fK50c0Q3; 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-5784291f5fdsi368530a12.184.2024.05.22.18.18.29; Wed, 22 May 2024 18:18:29 -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=fK50c0Q3; 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 CE6FA68D47F; Thu, 23 May 2024 04:18:10 +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 C1B1768D1BC for ; Thu, 23 May 2024 04:18:01 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 251C460003 for ; Thu, 23 May 2024 01:18:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716427081; 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=Cm+1CZn0nmr9lbbn1AGaoDPjAJSXPQI7tRyK7wQvGiY=; b=fK50c0Q3MqYhVC4WsiRh44cw69wU8cXOnB0d6J0YuRmmiATnmw1Nzek78PZLlbfonb+mJy XTVsvWX8LvUoglpm3ggDwVFAJnt1thenI59D8JVUHzGVvnpl5fWC/5EK8ifzRs3XSbZ5qQ FNdTCL4B+FWWzNWLxYZ64jfUH+RmSbVysKYzHaSIxlYWop7VsOq3cytTA8ZLJbHzfxaI6I 7fTsX2/HIiMeUWF5/1ZcDlmnf+TDHiRzBMCSUd1A/tW+3Rt0GKQC94bUrfcnEbHr0EM7th LQotqE/0Oso0VwEV3sCGAKJV/LDsqfiFBh4WBHNqoWR0jwI9fL7gLRxFyvCyKg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 23 May 2024 03:17:54 +0200 Message-ID: <20240523011758.2434580-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240523011758.2434580-1-michael@niedermayer.cc> References: <20240523011758.2434580-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/7] avformat/ape: Use 64bit for final frame size 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: z6nJEatMcaWz Fixes: CID1505963 Unintentional integer overflow Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/ape.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/ape.c b/libavformat/ape.c index c0e3e9f4fe6..f86ca5e894c 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -292,7 +292,7 @@ static int ape_read_header(AVFormatContext * s) final_size -= final_size & 3; } if (file_size <= 0 || final_size <= 0) - final_size = ape->finalframeblocks * 8; + final_size = ape->finalframeblocks * 8LL; ape->frames[ape->totalframes - 1].size = final_size; for (i = 0; i < ape->totalframes; i++) {