From patchwork Mon Jul 8 22:24:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50423 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp29167vqb; Mon, 8 Jul 2024 15:24:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV5pH3IwJhPdt7qZvyReVOASA+97RYJQueX9fzECKfQk/BroZAu2s0pH2FhF1qI0PG9IQoNIv4jTPnNqoCd1lC5ZuaSmJHxyzJL+g== X-Google-Smtp-Source: AGHT+IGNmylLOmfhBD0QwZkbE5qqBDs5EnmX6e/Fh7q6oPIz6CVrxC+0u8x8d99Wximero29l6tc X-Received: by 2002:a05:6402:518f:b0:57d:5ac:7426 with SMTP id 4fb4d7f45d1cf-594ba997545mr490860a12.9.1720477498896; Mon, 08 Jul 2024 15:24:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720477498; cv=none; d=google.com; s=arc-20160816; b=PVqL7TeTvbkT8qU0nOS4Bpd1d5Q/fmpEIa0sr1bmYqKQtiiU7btmNI+wvs7OMNV1Rt iI8GKHeVC91Nc5uNtL89D7w61aFR6ID8HpuJTSa4eAu4sl/fMue9sGTraH0mFEgdQB/Z n3zwcD6OO+e6V+BfC9JIbEKrCSpOB9prv3kGPxC71rcuBDvsJGtjhxJFJT2qer/iY+WX 5iRAekBAzkXHIgD9agIKyrrlKwznqKuIK7LLz7fIIcrWW9VQwNKyuV0SbQuZaSyvfnfD M3wsY5bsHogVozPQd82PG2+IXskalDKXKkVNGn+J+TaRvc1RfnynVxICwbbDu97NKduf I6WA== 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=gwNMovKZFwH6/ugkniBJFMmJo4mJ+2yB541oQYta/C4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=poIrCcz/8iJ6kxnloLKN4ufUy23TwjI4TJCumvQiI9AKne5gCvauo9eq3JNTs6BwSA JUIfFhEDOgIdAAL1cs85L422JF0y+uxUCRXN24bfnGxix96XfZR+7sFCTAMjpiP8h2at jsuedJL/V4hQo50aRxGTh4xr75h74RWzsQzu1DnVKH0y3A+tmDgw7DnYN0gsKdmRgb+8 2q7/I1ZTjQlAUAt0LxplWkxjUpL6FV0M9vJR20XLP3WOU9OlV6KyK1ltf2KGMc7BMm9E UmEcna00MAIx5bU2sJzx49L+C0ZUNTIwiG4op9y5hD8zYY/lN8S/K1DZypxzKCfQGHQH Xefw==; 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=B2gk8xOy; 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-594bbe2c93asi272711a12.27.2024.07.08.15.24.58; Mon, 08 Jul 2024 15:24:58 -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=B2gk8xOy; 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 2512E68DCBB; Tue, 9 Jul 2024 01:24:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D5FD68DC1E for ; Tue, 9 Jul 2024 01:24:17 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9C0ACE0002 for ; Mon, 8 Jul 2024 22:24:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720477456; 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=zC3qJbZs5POIlzA3pD1VcxDB49MUcOB2Y4SElJTSdSk=; b=B2gk8xOy+d3euHcRneD4k/Vo8TC3IbN3PmVI6fv/rTe84M3Zb16Y2G6wc8p35f2lw/GJXP DGXZejAYbYl9zj4HHwSSsacMXsa7KxHgkFaEOjQXq7qYHZkgyTepRhXx6SPVbbnggesKkc fGRJU7CQPnI6bkiN/SJHSe8tfpNBb3nNOMHc9+KlWUgpoZnTDBniGMVEPNglST3QZaxTF8 855YVu5MJCkxI0fZ5h9E+nckMp4+CypH6cyFQtJ4fs03bpCi7BcZz5jzBkW1ByGPMbqWji 0sBYTuXLYQhyFe5X8JtDlciG9rBYkzbkFahHJkJ6fPko4SwilnLrcFnMkcu9tw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 9 Jul 2024 00:24:07 +0200 Message-ID: <20240708222410.773456-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708222410.773456-1-michael@niedermayer.cc> References: <20240708222410.773456-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 5/8] avfilter/vf_premultiply: Use AV_PIX_MAX_PLANES 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: YoeFJ9FHbmQD Helps: CID1435164 Out-of-bounds read Helps: CID1435165 Out-of-bounds read Helps: CID1435167 Out-of-bounds read Helps: CID1435169 Out-of-bounds read Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/vf_premultiply.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c index e077d46a9a0..5e97c2000f2 100644 --- a/libavfilter/vf_premultiply.c +++ b/libavfilter/vf_premultiply.c @@ -36,8 +36,8 @@ typedef struct ThreadData { typedef struct PreMultiplyContext { const AVClass *class; - int width[4], height[4]; - int linesize[4]; + int width[AV_VIDEO_MAX_PLANES], height[AV_VIDEO_MAX_PLANES]; + int linesize[AV_VIDEO_MAX_PLANES]; int nb_planes; int planes; int inverse; @@ -45,7 +45,7 @@ typedef struct PreMultiplyContext { int half, depth, offset, max; FFFrameSync fs; - void (*premultiply[4])(const uint8_t *msrc, const uint8_t *asrc, + void (*premultiply[AV_VIDEO_MAX_PLANES])(const uint8_t *msrc, const uint8_t *asrc, uint8_t *dst, ptrdiff_t mlinesize, ptrdiff_t alinesize, ptrdiff_t dlinesize,