From patchwork Fri Dec 22 21:44:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45300 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp1339350pzh; Fri, 22 Dec 2023 13:45:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IFRvfyAv3iJWd1o6EYKSq4tDqKM+tEhMUvx8NsheW99QQOvQy/zEVaTTnIchT7zwUKmEBog X-Received: by 2002:a05:600c:354c:b0:40b:5e1e:cf6 with SMTP id i12-20020a05600c354c00b0040b5e1e0cf6mr1303423wmq.49.1703281513577; Fri, 22 Dec 2023 13:45:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703281513; cv=none; d=google.com; s=arc-20160816; b=SK1SPE/ShBKSqIZ85zGU3koJyajcDNI8gE1mkbAsj10RE+8mnD2b3iNqb68aNxN4kz +Sa5jewyIYnZyL3LlLXTBc4vcMvJqN8zgwkr2hd1sqZVcMOoDTTbOl4VWfH4GsUaYxab mwTOJuLtlHjOpwtxkvNgqxL8PIF+4MZs25cCFcTQUVwXil3RPbeocavhu+07qyM6814l TsluwxZWIR8Z1r22brC7id05yq54DIpPp/1NHYEhf1XnAzM+A4ugorD2G6dx6or5+enG bbF8po2+SaubetYTHcZjZWVXvullfKRhCC34hXx4OFFuLtFUbT5Q9/vd51OhAhwxw/WP TpXw== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=LKf1QmHMSKjwnTwHOsvv6PqqsNthJFq0rhJQlUobyRs=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=mk/7qc6qVl136RfOnL6liE8JQzHr+othP9K3iU0/w2s2ptxHMbvJIBtXppRDdYmerY jf4Fo40LErlsbL9ifw2ERXPm/HY8Nmipz659vYl5/tBl+JZjYryG0iNgO95n1DLTctHi s3wW+Ovcmw7XqF1Mdkr4D/pggE7KL6lLm1vOegicKS0FNTS/qigXun9x9BkWeAYMbIOA qNC173zGFRUSEODs+wvLNt9Fw2XQhs1TTUDAaICNW3n3OD0NlAAJ5/bz1phsecYevNdf ONFOmiyEJKPEEkEouNJGoykxoE0nH0fWylhMhWk8CozLO19G+ZZ53esPlE2HW2qEQWGF J9QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=mcFqL0P0; 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 fx16-20020a170906b75000b00a235fc5744esi2157939ejb.481.2023.12.22.13.45.13; Fri, 22 Dec 2023 13:45:13 -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=mcFqL0P0; 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 4B62368D2CC; Fri, 22 Dec 2023 23:45:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E46AC68D280 for ; Fri, 22 Dec 2023 23:45:03 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 25462C0004 for ; Fri, 22 Dec 2023 21:45:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1703281503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=sskTwQX8km64gT0Xe46T6NoMIKTpPQd1hYWXWnKnSFs=; b=mcFqL0P0KqfMJXC6MPFVdkWL5OG3+7hOh8yefkkoX+UOmG8kPzf5k5jsPTTzXrhr22F1OI +wNSlxQLKB4XPxZ4mjbVyV9YdgVOy732lujDvJz8+Mg9oHBlhVVow2bLzQgjucmwDOT54u fC1wAejeB6qY1ZrnYadoIHTzvPUDH1N6VHu3hp69CwDPAJf4DDEnVtGKn+5OtX+6w6vpep 84TcyVe/tTyKuY6Se9BEE+flNBpMfNtKCNHTlGPnZjpwMaXBUyLGpeegvykZr9HPGrMdVT CwDI6DEoi2Aet3eGSmPZlfqDNkVFVl4YDbCbOohViPnRSfUIerjHGOLoM29tCQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 22 Dec 2023 22:44:59 +0100 Message-Id: <20231222214502.24596-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/4] avfilter/af_alimiter: Check nextpos before use 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: Z3CXayx8UMyW Fixes: out of array read Fixes: tickets/10744/poc11ffmpeg Found-by: Li Zeyuan and Zeng Yunxiang. Signed-off-by: Michael Niedermayer --- libavfilter/af_alimiter.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavfilter/af_alimiter.c b/libavfilter/af_alimiter.c index f08893229de..9a867047643 100644 --- a/libavfilter/af_alimiter.c +++ b/libavfilter/af_alimiter.c @@ -195,9 +195,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) int j = i % buffer_size; double ppeak = 0, pdelta; - for (c = 0; c < channels; c++) { - ppeak = FFMAX(ppeak, fabs(buffer[nextpos[j] + c])); - } + if (nextpos[j] >= 0) + for (c = 0; c < channels; c++) { + ppeak = FFMAX(ppeak, fabs(buffer[nextpos[j] + c])); + } pdelta = (limit / peak - limit / ppeak) / (((buffer_size - nextpos[j] + s->pos) % buffer_size) / channels); if (pdelta < nextdelta[j]) { nextdelta[j] = pdelta; 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]; From patchwork Fri Dec 22 21:45:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45302 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp1339503pzh; Fri, 22 Dec 2023 13:45:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IE6aUPfrvGfrphoOeksN6U1FQS4jRly9ZmHmSVFF66q5GyrhdIrksdMmy/5vQPQCvjWckqm X-Received: by 2002:a17:906:5acf:b0:a23:58f9:e1e0 with SMTP id x15-20020a1709065acf00b00a2358f9e1e0mr2272099ejs.2.1703281531635; Fri, 22 Dec 2023 13:45:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703281531; cv=none; d=google.com; s=arc-20160816; b=HUgFGy5MwYrPFFEcGr8+aMAO22GSFwGvYKTDFVZfRzjoBVb8csJY68itd239GVpCRT NVcuWwP/x8IbBVOT2NpPdG2JICmlT+9fJGUsh+xLapLD8K2avnmsSepZZLMPQulR9Oz0 uxGKopoXN33jedCCQkatitgKd7luez7er+NcSCtqXkKCqc5k3stw40c+zzmBfr47mPv/ 5vi78L09lqtxknkWz4+2s7rZ1kQ9Yz5dvnDFK5J0ZT6ihKTo0lgNAqpcEu7JeCBbBMv/ QHbqejpVe2nv0sR61QvGDmK09eMbBC297y6UD3oLZM8Ly3bxrowL3lelvQbovFWXvcDY Qfew== 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=JkT3yCyhOZ8WrlC6R6yaELd7ccmSt2Yh4FWFxHnW1Wk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=vrOnI5bDTm4VxAyC3fGSwPuptU17hnEg7zHMMTYrXgEwumf392iB6zbOWTfGQo994c VWEhpknr8FM6Zqv+d98ftZAKSDD8hGi5Bt02tR6Z/Dnj+R3PWdjoWp7xoPfimb9MQMFy u042Y2amwkuJP3r5JTPtmcSDYzjlHgCB28+P1alAQDJzd9+kkOoP2EZagkQoYyBUtDAd icVCO8EZam7pArSMPAuCNG2KR5xNLyoSo6uIhNsxJDuNK7F9QtoVOEODHMr3xQwP9jux fE7bvKCV1eX5svmowEUtbnjb2+mwCbEqgBrsUP2HfwpPnK6yNKhAZNZI/7HMllsxZyDw llkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=O9AAs4uQ; 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 x17-20020a170906b09100b00a232c95e38csi2140965ejy.503.2023.12.22.13.45.30; Fri, 22 Dec 2023 13:45:31 -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=O9AAs4uQ; 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 38AB468D305; Fri, 22 Dec 2023 23:45:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61F5268D2CE for ; Fri, 22 Dec 2023 23:45:05 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id BE7C6C0003 for ; Fri, 22 Dec 2023 21:45:04 +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=ntz/aUFhfqjPzRMadPSz/51rRbLgZzv+BUPv5IoOlKo=; b=O9AAs4uQHP1tM3OSYTVR3qwvNrjc4V4GBXevAHexo4qs4RiVsq7qHLtVJgbvn0C66vxQh9 Ty8chtQmtwLh37j/de8k0pOHrq2G5/agIfgTai0RC8pTawcvOW3G9OegeaaRS+Xl0r6FeN iglSbftbrs1dXxxRFg3+hDH6F7oM5hnB2AemsEKH5IkruWLuzo+5yCu0b4SI9ApQj2Y+Sm uxDzYbKnGAmEejxomoSPBmUosFJmNHT4CKI8q6fMgJ8YubC6SePB++anAeL8v2jlriYvC4 6sTo/MPx7ozZewRiw1EbIYG3KNQgQtYVIhgQKFvP4YdLmYobjNd+Zglbf/EnEQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 22 Dec 2023 22:45:01 +0100 Message-Id: <20231222214502.24596-3-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 3/4] avfilter/vf_swaprect: Use height for vertical variables 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: 2a9ijFyB/J/P Signed-off-by: Michael Niedermayer --- libavfilter/vf_swaprect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_swaprect.c b/libavfilter/vf_swaprect.c index 8a983b605bf..20d8e233e45 100644 --- a/libavfilter/vf_swaprect.c +++ b/libavfilter/vf_swaprect.c @@ -150,10 +150,10 @@ FF_ENABLE_DEPRECATION_WARNINGS w = dw; h = dh; x1[0] = dx1; y1[0] = dy1; x2[0] = dx2; y2[0] = dy2; x1[0] = av_clip(x1[0], 0, inlink->w - 1); - y1[0] = av_clip(y1[0], 0, inlink->w - 1); + y1[0] = av_clip(y1[0], 0, inlink->h - 1); x2[0] = av_clip(x2[0], 0, inlink->w - 1); - y2[0] = av_clip(y2[0], 0, inlink->w - 1); + y2[0] = av_clip(y2[0], 0, inlink->h - 1); ah[1] = ah[2] = AV_CEIL_RSHIFT(h, s->desc->log2_chroma_h); ah[0] = ah[3] = h; From patchwork Fri Dec 22 21:45:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45303 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp1339550pzh; Fri, 22 Dec 2023 13:45:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IGyMz90jXQEuIvdRHBu82Qe422aoFU6ngZDdNtdh5n4HMnKJDuRyJZG6+4lRtZNK+GZKNwx X-Received: by 2002:a17:907:175b:b0:a23:5dc7:7f16 with SMTP id lf27-20020a170907175b00b00a235dc77f16mr1137180ejc.89.1703281539341; Fri, 22 Dec 2023 13:45:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703281539; cv=none; d=google.com; s=arc-20160816; b=yKjkWiVOwJf+OiGftY6DrfHFSLsxCl9q9DEnXKU/GqXxzD7+CHJTVItQAwE7Frso+7 O87DxFTwqrDfESKc3q7JGzI7FFXifLqKjqe/Eoc+SJlnObzUMyJp4bKRIwf8QZC/FjOy SsVvasCPrYd8CahgDP1CKzekXxAv+qnhmHDXeAOvy71cq8y5LjS32MjH9nTWtfrHdmJ7 UOvwIUyHuVvd/F953kYA2soHdCOOFEnse2BJ9gzgnAxla8iqsq7bVPpWadATW1j5lAgM 1EGdco0YTSulXdShBPwt+KUpskr/la80KuNrTcat1APze5Fxkvw+lX0TJbmjzyFQFh65 2+mg== 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=G7s3dvphLgq9jQVcokwCbDPLIAOwAWgM/wPo/H4FvoM=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=QkrT5fUfth+qBueNQzJPFjDwyv4ShbN0nSz+QKGXfjbsWu1iPh8j7DSVU6zyuZ4ynZ NH1BinI2ffnvLxY3LORDWsNDMBf8zPYLhvLYtEvpwKZOy0eUt4EX6Tc7/CjAY78MutCi FrQnpIgtdavp3KiQ0G/ZW+iQCGy8EwV2SOYY8ecmhFrFaptwtIkML/A+u5HL+tuuzGtm UlVPm9rcsGe7yIhsMJBhbwU0jYmYkgImxcFQNIKyjGiitR0nJhxpbg6+psinjLJWnD09 5KtiaVkj9FqWnGyH4JmSWxSF8jvEZc29/ENmY0TI3BbmYtRxJEgapahks8/FOyKbKWGY 2yVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=EVVGFjue; 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 kt2-20020a170906aac200b00a2685a293a1si2265221ejb.362.2023.12.22.13.45.38; Fri, 22 Dec 2023 13:45:39 -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=EVVGFjue; 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 21AA668D319; Fri, 22 Dec 2023 23:45:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFC4D68D2EF for ; Fri, 22 Dec 2023 23:45:06 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id DF3FB1BF203 for ; Fri, 22 Dec 2023 21:45:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1703281506; 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=lbsAlBQxxzoAX6Ej9VeoCnebSzciA1MemAS2T7Gr+9A=; b=EVVGFjue2q0KlTTiPKVSYrrC5mopD+g5LVTYGbtW6zuhuVZgA0miEQ0/WF+vA0DIfW2JPF wX78eswACM2YBRB4XlvHMAliu9aJb/jNhp9SFhyLTUEqNfWuTK/C6zYzFqzqCdvYpcSfeA UbY+TEpA7Pw6M2EwizwmUvo5qgqWCfUeKa0bLVmDcyEX2lRM2v17/WZjv2MdJI3peqj/lu Ol+x3F3bjEzHY7n/ACtzuaVrcYYVb9IL1akCLy59pgs+Io557vXbt8wm9VTuxZu43+29FQ 7NsOEyQmaQhbJpS+Bahlcee9Dt/Aua7NTPQEfUyPq0i0M7M056pXaex++EtTmA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 22 Dec 2023 22:45:02 +0100 Message-Id: <20231222214502.24596-4-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 4/4] avfilter/vf_swaprect: round coordinates down 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: zqFhJhXEV1Jk Fixes: out of array access: Fixes: tickets/10745/poc12ffmpeg Found-by: Li Zeyuan and Zeng Yunxiang. Signed-off-by: Michael Niedermayer --- libavfilter/vf_swaprect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_swaprect.c b/libavfilter/vf_swaprect.c index 20d8e233e45..119fd692fa7 100644 --- a/libavfilter/vf_swaprect.c +++ b/libavfilter/vf_swaprect.c @@ -173,14 +173,14 @@ FF_ENABLE_DEPRECATION_WARNINGS lw[1] = lw[2] = AV_CEIL_RSHIFT(inlink->w, s->desc->log2_chroma_w); lw[0] = lw[3] = inlink->w; - x1[1] = x1[2] = AV_CEIL_RSHIFT(x1[0], s->desc->log2_chroma_w); + x1[1] = x1[2] = (x1[0] >> s->desc->log2_chroma_w); x1[0] = x1[3] = x1[0]; - y1[1] = y1[2] = AV_CEIL_RSHIFT(y1[0], s->desc->log2_chroma_h); + y1[1] = y1[2] = (y1[0] >> s->desc->log2_chroma_h); y1[0] = y1[3] = y1[0]; - x2[1] = x2[2] = AV_CEIL_RSHIFT(x2[0], s->desc->log2_chroma_w); + x2[1] = x2[2] = (x2[0] >> s->desc->log2_chroma_w); x2[0] = x2[3] = x2[0]; - y2[1] = y2[2] = AV_CEIL_RSHIFT(y2[0], s->desc->log2_chroma_h); + y2[1] = y2[2] = (y2[0] >> s->desc->log2_chroma_h); y2[0] = y2[3] = y2[0];