From patchwork Fri Dec 22 21:45:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45301 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp1339407pzh; Fri, 22 Dec 2023 13:45:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IHYKtbP+kPw6OnceQHTveudbaPeaUH+OQb9iK8HAdEIPxgdL2z3RtathhWcB5/WGBtPQRri X-Received: by 2002:a5d:4a0f:0:b0:336:704b:cd94 with SMTP id m15-20020a5d4a0f000000b00336704bcd94mr1126349wrq.70.1703281522383; Fri, 22 Dec 2023 13:45:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703281522; cv=none; d=google.com; s=arc-20160816; b=Q04t/XfEppQbr6RgxIMiaWst5tJ5KTiLys0+qJjgK770/o1Xt3szU0qCGpPmOQe+8A DUGTO9q4kxkmWZlwH5e0lXlYOAs/5fkQnMbdM0kvoqZCin9sNcTLoG/YGVonWGuf04Hk rsTC/Z4sygu+ejVHx6juvs975U8Ep6ay0/mCXADZ/g07P+tgAej2+Nwv0eQ23bS1E1g7 nQYp+ymfmWuoo+SVGptArfSEgwvRL3ow1oAG8birwVQp7dT+a9gTCjcQ06743aw1uy+n 0tsMHTnAf2/n12Nh9Fhzq1FU1KNOSHmT/J/5KQNW4MbPxmxdpiiBgxTj58vSnGaL0Loq CXcg== 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=REudxBseTBxa7NpOxIBIXbGGJX7ACmjMJODlcW2vZ+g=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=wiGu/wdR32IId2K9DsbldsLPBX5GrslU2fFT7bDoTVfZAqQxgWjMQEEmwVWJvCqIUj eeiUOz02JPqEW96w914jSnYshuN4Lvx3WrAHDu1QbcVAn2ozvFQ4RXUb8nITE/csT4cU 9C+wG9TdYqFoM7n+TkQUnKL8L3wNJD11LfmPbfkFeIDRJNqeXEOtgWKZ4BIkrDD6055L JDjaVfdx4OBaINlcZPi8sJJaHvvls4E8luqupjKGU1ULS+u96OCbOVdky0UjeMj1dyl4 EFiIrDAviX1PsCiKFSI45su5hIT/7nUUknxqInL69kKBjwPLmKL//g6M9ec6g2nbpeKL 1ePw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=Z8MODwGB; 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 u30-20020a50951e000000b005546f435fa5si535474eda.120.2023.12.22.13.45.22; Fri, 22 Dec 2023 13:45:22 -0800 (PST) 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=Z8MODwGB; 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 427B268D2EB; Fri, 22 Dec 2023 23:45:11 +0200 (EET) 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 ACA3468D280 for ; Fri, 22 Dec 2023 23:45:04 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 128BFE0002 for ; Fri, 22 Dec 2023 21:45:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1703281504; 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=RsLgrQ4Ima3jMHDAtL3Wge0uOKW65u2XGQhWd6QNykI=; b=Z8MODwGBWd9hgdLYsY3Pvye3XpkZZpmwgduP7E0Cyt3XELw+k9kfsNpJ55dtXMD5RhCKFn u1Ut47eIFYBFX6pS2d3AKl1r+oXhL1B1+WeLcaSpup58Chb1ixzbRUJo56A4xmbtizjt5r l0w+ejBue4cEM0wUomAWMiSH14gbma03VnpgndUssVArhGyR5Tvn8fm+SCdua46Kb0soOK ZXeCpxfS/unTLpiCeJunZHDwdW8e00GindpGC3GMEuhm+mc7hBjG8MOojufbcSCdoWd/Aq vyl5qU8eyYJzmyjoJycQNbUsTeL46LN4xQ98q5vSkwNc/svkxlHnVoVIvLz+Kw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 22 Dec 2023 22:45:00 +0100 Message-Id: <20231222214502.24596-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231222214502.24596-1-michael@niedermayer.cc> References: <20231222214502.24596-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/4] avfilter/vf_swaprect: assert that rectangles are within memory 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: OFC9kOCO5LxR Signed-off-by: Michael Niedermayer --- libavfilter/vf_swaprect.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/vf_swaprect.c b/libavfilter/vf_swaprect.c index 13ae149afdb..8a983b605bf 100644 --- a/libavfilter/vf_swaprect.c +++ b/libavfilter/vf_swaprect.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/eval.h" #include "libavutil/imgutils.h" @@ -182,6 +183,10 @@ FF_ENABLE_DEPRECATION_WARNINGS y2[1] = y2[2] = AV_CEIL_RSHIFT(y2[0], s->desc->log2_chroma_h); y2[0] = y2[3] = y2[0]; + + av_assert0(FFMAX(x1[1], x2[1]) + pw[1] <= lw[1]); + av_assert0(FFMAX(y1[1], y2[1]) + ph[1] <= lh[1]); + for (p = 0; p < s->nb_planes; p++) { if (ph[p] == ah[p] && pw[p] == aw[p]) { uint8_t *src = in->data[p] + y1[p] * in->linesize[p] + x1[p] * s->pixsteps[p];