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;